summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.github/calcrom/calcrom.pl (renamed from .travis/calcrom/calcrom.pl)0
-rwxr-xr-x.github/calcrom/webhook.sh (renamed from .travis/calcrom/webhook.sh)7
-rw-r--r--.github/workflows/build.yml40
-rw-r--r--.travis.yml39
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc7
-rw-r--r--data/scripts/battle_pike.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc13
-rw-r--r--data/scripts/interview.inc13
-rw-r--r--data/scripts/secret_base.inc4
-rw-r--r--data/specials.inc2
-rw-r--r--data/text/contest_painting.inc5
-rw-r--r--gflib/bg.c36
-rw-r--r--gflib/dma3_manager.c118
-rw-r--r--include/cable_club.h2
-rw-r--r--include/constants/battle_tower.h8
-rw-r--r--ld_script_modern.txt9
-rw-r--r--src/battle_anim_fight.c52
-rw-r--r--src/battle_main.c8
-rwxr-xr-xsrc/berry_crush.c464
-rw-r--r--src/cable_club.c3
-rw-r--r--src/contest_painting.c4
-rw-r--r--src/field_specials.c221
-rw-r--r--src/librfu_rfu.c21
-rw-r--r--src/main.c3
24 files changed, 547 insertions, 534 deletions
diff --git a/.travis/calcrom/calcrom.pl b/.github/calcrom/calcrom.pl
index 4858babb9..4858babb9 100755
--- a/.travis/calcrom/calcrom.pl
+++ b/.github/calcrom/calcrom.pl
diff --git a/.travis/calcrom/webhook.sh b/.github/calcrom/webhook.sh
index 86da74c87..2a3015969 100755
--- a/.travis/calcrom/webhook.sh
+++ b/.github/calcrom/webhook.sh
@@ -1,10 +1,5 @@
#!/bin/bash -ex
-# Only run this script if it's the master branch build.
-if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then
- exit 0
-fi
-
build_name=$1
map_file=$build_name.map
if [ ! -f $map_file ]; then
@@ -13,4 +8,4 @@ if [ ! -f $map_file ]; then
fi
output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
-curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL
+curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..822b386ea
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,40 @@
+name: CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+
+jobs:
+ build:
+ runs-on: ubuntu-18.04
+ steps:
+ - name: Checkout
+ uses: actions/checkout@master
+
+ - name: Install binutils
+ run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
+ # build-essential, git, and libpng-dev are already installed
+ # gcc-arm-none-eabi is only needed for the modern build
+ # as an alternative to dkP
+
+ - name: Install agbcc
+ run: |
+ git clone https://github.com/pret/agbcc.git
+ cd agbcc
+ ./build.sh
+ ./install.sh ../
+
+ - name: Compare
+ run: make -j${nproc} compare
+
+ - name: Modern
+ run: make -j${nproc} modern
+
+ - name: Webhook
+ if: ${{ github.event_name == 'push' }}
+ env:
+ CALCROM_DISCORD_WEBHOOK_USERNAME: OK
+ CALCROM_DISCORD_WEBHOOK_AVATAR_URL: https://i.imgur.com/38BQHdd.png
+ CALCROM_DISCORD_WEBHOOK_URL: ${{ secrets.CALCROM_DISCORD_WEBHOOK_URL }}
+ run: sh .github/calcrom/webhook.sh pokeemerald
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8d39be503..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: generic
-dist: bionic
-sudo: false
-env:
- global:
- - DEVKITPRO=$HOME
- - DEVKITARM=$DEVKITPRO/devkitARM
-addons:
- apt:
- packages:
- - gcc-multilib
- - linux-libc-dev
-cache:
- apt: true
-install:
- - pushd $HOME
- - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz
- - tar xJf devkitARM*.tar.xz
- - travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz
- - tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM
- - travis_retry git clone https://github.com/pret/agbcc.git
- - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
- - popd
-matrix:
- include:
- - os: linux
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - g++-7
- env: _="Build"
- script:
- - make -j2 tools CXX=g++-7
- - make -j2 compare
- - make -j2 modern
-after_success:
- - .travis/calcrom/webhook.sh pokeemerald
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index f4de37232..dfce6d155 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -143,7 +143,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
special LoadPlayerParty
frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
- call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514
+ call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
@@ -383,9 +383,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
end
-@ Some link function. Sets battle type flags at least
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514:: @ 8249514
- special sub_813B534
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink:: @ 8249514
+ special BattleTowerReconnectLink
return
BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 67eb19011..7ba25321d 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -1,5 +1,5 @@
@ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal
-BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B
+BattleFrontier_BattlePikeRoom_MapScripts: @ 82C3E1B
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 84cd315f7..c7f576aba 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,16 +1,3 @@
-@ Unused
-EventScript_28CCAA:: @ 828CCAA
- setvar VAR_0x8005, 8
- special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq EventScript_UnusedRet
- setvar VAR_0x8005, 8
- special InterviewAfter
- return
-
-EventScript_UnusedRet:: @ 828CCC6
- return
-
@ Gabby and Ty always move to the same spots for the first 5 battles
@ From the 6th battle onwards, they move randomly between locations 6-8
@ Note: The local IDs of Gabby and Ty are hard-coded in GabbyAndTySetScriptVarsToObjectEventLocalIds
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index f968577f3..9921aa603 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -342,3 +342,16 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return
+
+@ Unused
+EventScript_ContestLiveInterview:: @ 828CCAA
+ setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
+ special InterviewBefore
+ compare VAR_RESULT, TRUE
+ goto_if_eq EventScript_ContestLiveInterviewEnd
+ setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
+ special InterviewAfter
+ return
+
+EventScript_ContestLiveInterviewEnd:: @ 828CCC6
+ return
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 4a20de9a6..9e7a60e15 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B
end
SecretBase_EventScript_FirstEntrance:: @ 8275B81
- applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4
+ applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_EnterBase
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO
@@ -175,7 +175,7 @@ SecretBase_EventScript_SetAsBase:: @ 8275BAB
waitstate
end
-SecretBase_Movement_275BB4: @ 8275BB4
+SecretBase_Movement_EnterBase: @ 8275BB4
walk_up
walk_up
step_end
diff --git a/data/specials.inc b/data/specials.inc
index 97f698379..620fae369 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -514,7 +514,7 @@ gSpecials:: @ 81DBA64
def_special SetMewAboveGrass
def_special ShouldDistributeEonTicket
def_special LinkRetireStatusWithBattleTowerPartner
- def_special sub_813B534
+ def_special BattleTowerReconnectLink
def_special CallTrainerHillFunction
def_special Script_DoRayquazaScene @ Listed twice
def_special LoopWingFlapSE
diff --git a/data/text/contest_painting.inc b/data/text/contest_painting.inc
index 2aa8c6a93..78ae80153 100644
--- a/data/text/contest_painting.inc
+++ b/data/text/contest_painting.inc
@@ -1,8 +1,9 @@
-gUnknown_0827EA0C:: @ 827EA0C
+gContestPaintingCaption:: @ 827EA0C
.string "{STR_VAR_1}\n"
.string "{STR_VAR_2}'s {STR_VAR_3}$"
-gUnknown_0827EA17:: @ 827EA17
+@ Unused
+gContestPaintingContest:: @ 827EA17
.string "CONTEST$"
gContestRankNormal::
diff --git a/gflib/bg.c b/gflib/bg.c
index 1ca8a44a1..3c215c103 100644
--- a/gflib/bg.c
+++ b/gflib/bg.c
@@ -9,19 +9,19 @@
struct BgControl
{
struct BgConfig {
- u16 visible:1;
- u16 unknown_1:1;
- u16 screenSize:2;
- u16 priority:2;
- u16 mosaic:1;
- u16 wraparound:1;
-
- u16 charBaseIndex:2;
- u16 mapBaseIndex:5;
- u16 paletteMode:1;
-
- u8 unknown_2;
- u8 unknown_3;
+ u8 visible:1;
+ u8 unknown_1:1;
+ u8 screenSize:2;
+ u8 priority:2;
+ u8 mosaic:1;
+ u8 wraparound:1;
+
+ u8 charBaseIndex:2;
+ u8 mapBaseIndex:5;
+ u8 paletteMode:1;
+
+ u8 unknown_2; // Assigned to but never read
+ u8 unknown_3; // Assigned to but never read
} configs[NUM_BACKGROUNDS];
u16 bgVisibilityAndMode;
@@ -102,17 +102,17 @@ static void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8
{
if (charBaseIndex != 0xFF)
{
- sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3;
+ sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex;
}
if (mapBaseIndex != 0xFF)
{
- sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F;
+ sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex;
}
if (screenSize != 0xFF)
{
- sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3;
+ sGpuBgConfigs.configs[bg].screenSize = screenSize;
}
if (paletteMode != 0xFF)
@@ -122,12 +122,12 @@ static void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8
if (priority != 0xFF)
{
- sGpuBgConfigs.configs[bg].priority = priority & 0x3;
+ sGpuBgConfigs.configs[bg].priority = priority;
}
if (mosaic != 0xFF)
{
- sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1;
+ sGpuBgConfigs.configs[bg].mosaic = mosaic;
}
if (wraparound != 0xFF)
diff --git a/gflib/dma3_manager.c b/gflib/dma3_manager.c
index 43744883f..d774efe8c 100644
--- a/gflib/dma3_manager.c
+++ b/gflib/dma3_manager.c
@@ -8,88 +8,90 @@
#define DMA_REQUEST_COPY16 3
#define DMA_REQUEST_FILL16 4
-BSS_DATA struct
+struct Dma3Request
{
const u8 *src;
u8 *dest;
u16 size;
u16 mode;
u32 value;
-} gDma3Requests[MAX_DMA_REQUESTS];
+};
-static volatile bool8 gDma3ManagerLocked;
-static u8 gDma3RequestCursor;
+static struct Dma3Request sDma3Requests[MAX_DMA_REQUESTS];
+
+static vbool8 sDma3ManagerLocked;
+static u8 sDma3RequestCursor;
void ClearDma3Requests(void)
{
int i;
- gDma3ManagerLocked = TRUE;
- gDma3RequestCursor = 0;
+ sDma3ManagerLocked = TRUE;
+ sDma3RequestCursor = 0;
for (i = 0; i < MAX_DMA_REQUESTS; i++)
{
- gDma3Requests[i].size = 0;
- gDma3Requests[i].src = NULL;
- gDma3Requests[i].dest = NULL;
+ sDma3Requests[i].size = 0;
+ sDma3Requests[i].src = NULL;
+ sDma3Requests[i].dest = NULL;
}
- gDma3ManagerLocked = FALSE;
+ sDma3ManagerLocked = FALSE;
}
void ProcessDma3Requests(void)
{
u16 bytesTransferred;
- if (gDma3ManagerLocked)
+ if (sDma3ManagerLocked)
return;
bytesTransferred = 0;
// as long as there are DMA requests to process (unless size or vblank is an issue), do not exit
- while (gDma3Requests[gDma3RequestCursor].size != 0)
+ while (sDma3Requests[sDma3RequestCursor].size != 0)
{
- bytesTransferred += gDma3Requests[gDma3RequestCursor].size;
+ bytesTransferred += sDma3Requests[sDma3RequestCursor].size;
if (bytesTransferred > 40 * 1024)
return; // don't transfer more than 40 KiB
if (*(u8 *)REG_ADDR_VCOUNT > 224)
return; // we're about to leave vblank, stop
- switch (gDma3Requests[gDma3RequestCursor].mode)
+ switch (sDma3Requests[sDma3RequestCursor].mode)
{
case DMA_REQUEST_COPY32: // regular 32-bit copy
- Dma3CopyLarge32_(gDma3Requests[gDma3RequestCursor].src,
- gDma3Requests[gDma3RequestCursor].dest,
- gDma3Requests[gDma3RequestCursor].size);
+ Dma3CopyLarge32_(sDma3Requests[sDma3RequestCursor].src,
+ sDma3Requests[sDma3RequestCursor].dest,
+ sDma3Requests[sDma3RequestCursor].size);
break;
case DMA_REQUEST_FILL32: // repeat a single 32-bit value across RAM
- Dma3FillLarge32_(gDma3Requests[gDma3RequestCursor].value,
- gDma3Requests[gDma3RequestCursor].dest,
- gDma3Requests[gDma3RequestCursor].size);
+ Dma3FillLarge32_(sDma3Requests[sDma3RequestCursor].value,
+ sDma3Requests[sDma3RequestCursor].dest,
+ sDma3Requests[sDma3RequestCursor].size);
break;
case DMA_REQUEST_COPY16: // regular 16-bit copy
- Dma3CopyLarge16_(gDma3Requests[gDma3RequestCursor].src,
- gDma3Requests[gDma3RequestCursor].dest,
- gDma3Requests[gDma3RequestCursor].size);
+ Dma3CopyLarge16_(sDma3Requests[sDma3RequestCursor].src,
+ sDma3Requests[sDma3RequestCursor].dest,
+ sDma3Requests[sDma3RequestCursor].size);
break;
case DMA_REQUEST_FILL16: // repeat a single 16-bit value across RAM
- Dma3FillLarge16_(gDma3Requests[gDma3RequestCursor].value,
- gDma3Requests[gDma3RequestCursor].dest,
- gDma3Requests[gDma3RequestCursor].size);
+ Dma3FillLarge16_(sDma3Requests[sDma3RequestCursor].value,
+ sDma3Requests[sDma3RequestCursor].dest,
+ sDma3Requests[sDma3RequestCursor].size);
break;
}
// Free the request
- gDma3Requests[gDma3RequestCursor].src = NULL;
- gDma3Requests[gDma3RequestCursor].dest = NULL;
- gDma3Requests[gDma3RequestCursor].size = 0;
- gDma3Requests[gDma3RequestCursor].mode = 0;
- gDma3Requests[gDma3RequestCursor].value = 0;
- gDma3RequestCursor++;
-
- if (gDma3RequestCursor >= MAX_DMA_REQUESTS) // loop back to the first DMA request
- gDma3RequestCursor = 0;
+ sDma3Requests[sDma3RequestCursor].src = NULL;
+ sDma3Requests[sDma3RequestCursor].dest = NULL;
+ sDma3Requests[sDma3RequestCursor].size = 0;
+ sDma3Requests[sDma3RequestCursor].mode = 0;
+ sDma3Requests[sDma3RequestCursor].value = 0;
+ sDma3RequestCursor++;
+
+ if (sDma3RequestCursor >= MAX_DMA_REQUESTS) // loop back to the first DMA request
+ sDma3RequestCursor = 0;
}
}
@@ -98,30 +100,30 @@ s16 RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode)
int cursor;
int i = 0;
- gDma3ManagerLocked = TRUE;
- cursor = gDma3RequestCursor;
+ sDma3ManagerLocked = TRUE;
+ cursor = sDma3RequestCursor;
while (i < MAX_DMA_REQUESTS)
{
- if (gDma3Requests[cursor].size == 0) // an empty request was found.
+ if (sDma3Requests[cursor].size == 0) // an empty request was found.
{
- gDma3Requests[cursor].src = src;
- gDma3Requests[cursor].dest = dest;
- gDma3Requests[cursor].size = size;
+ sDma3Requests[cursor].src = src;
+ sDma3Requests[cursor].dest = dest;
+ sDma3Requests[cursor].size = size;
if (mode == 1)
- gDma3Requests[cursor].mode = DMA_REQUEST_COPY32;
+ sDma3Requests[cursor].mode = DMA_REQUEST_COPY32;
else
- gDma3Requests[cursor].mode = DMA_REQUEST_COPY16;
+ sDma3Requests[cursor].mode = DMA_REQUEST_COPY16;
- gDma3ManagerLocked = FALSE;
+ sDma3ManagerLocked = FALSE;
return cursor;
}
if (++cursor >= MAX_DMA_REQUESTS) // loop back to start.
cursor = 0;
i++;
}
- gDma3ManagerLocked = FALSE;
+ sDma3ManagerLocked = FALSE;
return -1; // no free DMA request was found
}
@@ -130,31 +132,31 @@ s16 RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
int cursor;
int i = 0;
- cursor = gDma3RequestCursor;
- gDma3ManagerLocked = TRUE;
+ cursor = sDma3RequestCursor;
+ sDma3ManagerLocked = TRUE;
while (i < MAX_DMA_REQUESTS)
{
- if (gDma3Requests[cursor].size == 0) // an empty request was found.
+ if (sDma3Requests[cursor].size == 0) // an empty request was found.
{
- gDma3Requests[cursor].dest = dest;
- gDma3Requests[cursor].size = size;
- gDma3Requests[cursor].mode = mode;
- gDma3Requests[cursor].value = value;
+ sDma3Requests[cursor].dest = dest;
+ sDma3Requests[cursor].size = size;
+ sDma3Requests[cursor].mode = mode;
+ sDma3Requests[cursor].value = value;
if(mode == 1)
- gDma3Requests[cursor].mode = DMA_REQUEST_FILL32;
+ sDma3Requests[cursor].mode = DMA_REQUEST_FILL32;
else
- gDma3Requests[cursor].mode = DMA_REQUEST_FILL16;
+ sDma3Requests[cursor].mode = DMA_REQUEST_FILL16;
- gDma3ManagerLocked = FALSE;
+ sDma3ManagerLocked = FALSE;
return cursor;
}
if (++cursor >= MAX_DMA_REQUESTS) // loop back to start.
cursor = 0;
i++;
}
- gDma3ManagerLocked = FALSE;
+ sDma3ManagerLocked = FALSE;
return -1; // no free DMA request was found
}
@@ -166,7 +168,7 @@ s16 CheckForSpaceForDma3Request(s16 index)
{
while (i < MAX_DMA_REQUESTS)
{
- if (gDma3Requests[i].size != 0)
+ if (sDma3Requests[i].size != 0)
return -1;
i++;
}
@@ -174,7 +176,7 @@ s16 CheckForSpaceForDma3Request(s16 index)
}
else // check the specified request
{
- if (gDma3Requests[index].size != 0)
+ if (sDma3Requests[index].size != 0)
return -1;
return 0;
}
diff --git a/include/cable_club.h b/include/cable_club.h
index 7340742ea..a5a6acfa4 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -7,7 +7,7 @@ void CreateTask_EnterCableClubSeat(TaskFunc taskFunc);
u8 CreateTask_ReestablishCableClubLink(void);
void CB2_ReturnFromCableClubBattle(void);
bool32 AreBattleTowerLinkSpeciesSame(u16 *speciesList1, u16 *speciesList2);
-void sub_80B3AF8(u8 taskId);
+void Task_ReconnectWithLinkPlayers(u8 taskId);
void Task_WaitForLinkPlayerConnection(u8 taskId);
bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex);
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index f661ddc0b..002422d85 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -33,9 +33,9 @@
#define BATTLE_TOWER_LINK_CONTINUE 0
#define BATTLE_TOWER_LINK_RETIRE 1
-#define BATTLE_TOWER_LINKSTAT_CONTINUE 0
-#define BATTLE_TOWER_LINKSTAT_BOTH_RETIRE 1
-#define BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE 2
-#define BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE 3
+#define BATTLE_TOWER_LINKSTAT_CONTINUE 0
+#define BATTLE_TOWER_LINKSTAT_BOTH_RETIRE 1
+#define BATTLE_TOWER_LINKSTAT_MEMBER_RETIRE 2
+#define BATTLE_TOWER_LINKSTAT_LEADER_RETIRE 3
#endif //GUARD_CONSTANTS_BATTLE_TOWER_H
diff --git a/ld_script_modern.txt b/ld_script_modern.txt
index d12d99456..b69ada864 100644
--- a/ld_script_modern.txt
+++ b/ld_script_modern.txt
@@ -50,6 +50,15 @@ SECTIONS {
asm/*.o(.text);
} =0
+ .text.unlikely :
+ ALIGN(4)
+ {
+ src/crt0.o(.text.unlikely);
+ src/*.o(.text.unlikely);
+ gflib/*.o(.text.unlikely);
+ asm/*.o(.text.unlikely);
+ } =0
+
script_data :
ALIGN(4)
{
diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c
index 05138111b..328f178ae 100644
--- a/src/battle_anim_fight.c
+++ b/src/battle_anim_fight.c
@@ -51,51 +51,43 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08595E14 =
.callback = AnimUnused_080B08A0,
};
-static const union AnimCmd sAnim_HandOrFoot[] =
+static const union AnimCmd sAnim_Fist[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_SlidingKick_0[] =
+static const union AnimCmd sAnim_FootWide[] =
{
ANIMCMD_FRAME(16, 1),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_SlidingKick_1[] =
+static const union AnimCmd sAnim_FootTall[] =
{
ANIMCMD_FRAME(32, 1),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_CrossChopHand_0[] =
+static const union AnimCmd sAnim_HandLeft[] =
{
ANIMCMD_FRAME(48, 1),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_CrossChopHand_1[] =
+static const union AnimCmd sAnim_HandRight[] =
{
ANIMCMD_FRAME(48, 1, .hFlip = TRUE),
ANIMCMD_END,
};
-static const union AnimCmd *const sAnims_HandOrFoot[] =
+static const union AnimCmd *const sAnims_HandsAndFeet[] =
{
- sAnim_HandOrFoot,
-};
-
-static const union AnimCmd *const sAnims_SlidingKick[] =
-{
- sAnim_SlidingKick_0,
- sAnim_SlidingKick_1,
-};
-
-static const union AnimCmd *const sAnims_CrossChopHand[] =
-{
- sAnim_CrossChopHand_0,
- sAnim_CrossChopHand_1,
+ sAnim_Fist,
+ sAnim_FootWide,
+ sAnim_FootTall,
+ sAnim_HandLeft,
+ sAnim_HandRight,
};
const struct SpriteTemplate gKarateChopSpriteTemplate =
@@ -103,7 +95,7 @@ const struct SpriteTemplate gKarateChopSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSlideHandOrFootToTarget,
@@ -114,7 +106,7 @@ const struct SpriteTemplate gJumpKickSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimJumpKick,
@@ -125,7 +117,7 @@ const struct SpriteTemplate gFistFootSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimBasicFistOrFoot,
@@ -136,7 +128,7 @@ const struct SpriteTemplate gFistFootRandomPosSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimFistOrFootRandomPos,
@@ -147,7 +139,7 @@ const struct SpriteTemplate gCrossChopHandSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_CrossChopHand,
+ .anims = &sAnims_HandsAndFeet[3],
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimCrossChopHand,
@@ -158,7 +150,7 @@ const struct SpriteTemplate gSlidingKickSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_SlidingKick,
+ .anims = &sAnims_HandsAndFeet[1],
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSlidingKick,
@@ -182,7 +174,7 @@ const struct SpriteTemplate gSpinningHandOrFootSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = sAffineAnims_SpinningHandOrFoot,
.callback = AnimSpinningKickOrPunch,
@@ -205,7 +197,7 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = sAffineAnims_MegaPunchKick,
.callback = AnimSpinningKickOrPunch,
@@ -216,7 +208,7 @@ const struct SpriteTemplate gStompFootSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_SlidingKick,
+ .anims = &sAnims_HandsAndFeet[1],
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimStompFoot,
@@ -307,7 +299,7 @@ const struct SpriteTemplate gArmThrustHandSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimArmThrustHit,
@@ -411,7 +403,7 @@ const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
- .anims = sAnims_HandOrFoot,
+ .anims = sAnims_HandsAndFeet,
.images = NULL,
.affineAnims = sAffineAnims_FocusPunchFist,
.callback = AnimFocusPunchFist,
diff --git a/src/battle_main.c b/src/battle_main.c
index 75e74fe54..a1bc6ae7b 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -2276,7 +2276,7 @@ static void EndLinkBattleInSteps(void)
}
else if (gReceivedRemoteLinkPlayers == 0)
{
- CreateTask(sub_80B3AF8, 5);
+ CreateTask(Task_ReconnectWithLinkPlayers, 5);
gBattleCommunication[MULTIUSE_STATE]++;
}
else
@@ -2307,7 +2307,7 @@ static void EndLinkBattleInSteps(void)
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 5:
- if (!FuncIsActiveTask(sub_80B3AF8))
+ if (!FuncIsActiveTask(Task_ReconnectWithLinkPlayers))
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 6:
@@ -2430,11 +2430,11 @@ static void sub_803939C(void)
break;
case 1:
if (gMain.field_439_x4 && gReceivedRemoteLinkPlayers == 0)
- CreateTask(sub_80B3AF8, 5);
+ CreateTask(Task_ReconnectWithLinkPlayers, 5);
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 2:
- if (!FuncIsActiveTask(sub_80B3AF8))
+ if (!FuncIsActiveTask(Task_ReconnectWithLinkPlayers))
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 3:
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 9732e1205..1e3757ab2 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -141,7 +141,7 @@ struct BerryCrushGame_138
struct BerryCrushGame
{
MainCallback unk0;
- u32 (* unk4)(struct BerryCrushGame *, u8 *);
+ u32 (*unk4)(struct BerryCrushGame *, u8 *);
u8 unk8;
u8 unk9;
u8 mainTask;
@@ -186,47 +186,47 @@ static void VBlankCB(void);
static void MainCB(void);
static void MainTask(u8);
static void ParseName_Options(struct BerryCrushGame *);
-void sub_8022BEC(u16, u8, u8 *);
+static void BerryCrush_RunOrScheduleCommand(u16, u8, u8 *);
static void BerryCrush_SetPaletteFadeParams(u8 *, bool8, u32, s8, u8, u8, u16);
-static int sub_8021450(struct BerryCrushGame *);
-void sub_8022588(struct BerryCrushGame *);
-void sub_8022600(struct BerryCrushGame *);
-void sub_80226D0(struct BerryCrushGame *);
-void sub_8022730(struct BerryCrushGame *);
-void sub_8022960(struct BerryCrushGame *);
-void sub_8022524(struct BerryCrushGame_138 *, u16);
-void sub_8022B28(struct Sprite *);
-void sub_8022554(struct BerryCrushGame_138 *r0);
-void sub_8024578(struct BerryCrushGame *);
-void sub_8024644(u8 *, u32, u32, u32, u32);
-static void sub_8022A20(struct Sprite *sprite);
+static s32 sub_8021450(struct BerryCrushGame *);
+static void sub_8022588(struct BerryCrushGame *);
+static void sub_8022600(struct BerryCrushGame *);
+static void sub_80226D0(struct BerryCrushGame *);
+static void sub_8022730(struct BerryCrushGame *);
+static void sub_8022960(struct BerryCrushGame *);
+static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 *, u16);
+static void sub_8022B28(struct Sprite *);
+static void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 *r0);
+static void sub_8024578(struct BerryCrushGame *);
+static void BerryCrush_SetShowMessageParams(u8 *, u32, u32, u32, u32);
+static void SpriteCB_BerryCrushImpact(struct Sprite *sprite);
static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame *r6, u8 *r1);
-static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5);
-static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5);
-static u32 sub_8022E1C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8022E3C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8022EAC(struct BerryCrushGame *r4, u8 *r5);
-static u32 sub_8022F04(struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1);
-static u32 sub_8022F1C(struct BerryCrushGame *r5, u8 *r2);
-static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_80231B8(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_80232EC(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_80238F0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8023998(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6);
-static u32 sub_8023CAC(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1);
-static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6);
-static u32 sub_8024134(struct BerryCrushGame *r5, u8 *r4);
-static u32 sub_8024228(struct BerryCrushGame *r5, u8 *r6);
-static u32 sub_80242E0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
-static u32 sub_80243BC(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
-static u32 sub_8024444(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
-static u32 sub_8024508(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
-static u32 sub_8024568(__attribute__((unused)) struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1);
-
-static EWRAM_DATA struct BerryCrushGame *gBerryCrushGame = NULL;
+static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame *r4, u8 *r5);
+static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame *r7, u8 *r5);
+static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_AskPickBerry(struct BerryCrushGame *r4, u8 *r5);
+static u32 BerryCrushCommand_GoToBerryPouch(struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_WaitForOthersToPickBerries(struct BerryCrushGame *r5, u8 *r2);
+static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_DropLid(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_Countdown(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_PlayGame_Master(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_PlayGame_Slave(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame *r5, u8 *r6);
+static u32 BerryCrushCommand_TabulateResults(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame *r5, u8 *r6);
+static u32 BerryCrushCommand_SaveGame(struct BerryCrushGame *r5, u8 *r4);
+static u32 BerryCrushCommand_AskPlayAgain(struct BerryCrushGame *r5, u8 *r6);
+static u32 BerryCrushCommand_CommunicatePlayAgainResponses(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_PlayAgainFailureMessage(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_GracefulExit(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1);
+static u32 BerryCrushCommand_Quit(__attribute__((unused)) struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1);
+
+static EWRAM_DATA struct BerryCrushGame *sBerryCrushGamePtr = NULL;
static const u8 gUnknown_082F325C[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
static const u8 gUnknown_082F3264[] = { 0, 1, 2, 3, 5, 0, 0, 0 };
@@ -518,7 +518,7 @@ static const s8 gUnknown_082F41D2[][2] =
{ 40, -16},
};
-static const u16 gUnknown_082F41E8[] = {5, 6, 7, 8, 9, 0};
+static const u16 sPlayerBerrySpriteTags[] = {5, 6, 7, 8, 9, 0};
static const struct CompressedSpriteSheet gUnknown_082F41F4[] =
{
@@ -672,7 +672,7 @@ static const struct SpriteTemplate gUnknown_082F4324 =
.anims = gUnknown_082F42EC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = sub_8022A20
+ .callback = SpriteCB_BerryCrushImpact
};
static const struct SpriteTemplate gUnknown_082F433C =
@@ -697,7 +697,7 @@ static const struct SpriteTemplate gUnknown_082F4354 =
.callback = SpriteCallbackDummy
};
-static const struct SpriteTemplate gUnknown_082F436C =
+static const struct SpriteTemplate sSpriteTemplate_PlayerBerry =
{
.tileTag = 5,
.paletteTag = 5,
@@ -758,34 +758,34 @@ static const u8 *const gUnknown_082F43B4[] =
gText_PressingPowerRankings,
};
-static u32 (*const gUnknown_082F43CC[])(struct BerryCrushGame *, u8 *) =
+static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame *, u8 *) =
{
NULL,
BerryCrushCommand_BeginNormalPaletteFade,
- sub_8022CB0,
- sub_8022D14,
- sub_8022E1C,
- sub_8022E3C,
- sub_8022E5C,
- sub_8022EAC,
- sub_8022F04,
- sub_8022F1C,
- sub_8023070,
- sub_80231B8,
- sub_80232EC,
- sub_80238F0,
- sub_8023998,
- sub_8023A30,
- sub_8023BC0,
- sub_8023CAC,
- sub_8024048,
- sub_8024134,
- sub_8024228,
- sub_80242E0,
- sub_80243BC,
- sub_8024444,
- sub_8024508,
- sub_8024568,
+ BerryCrushCommand_WaitPaletteFade,
+ BerryCrushCommand_PrintMessage,
+ BerryCrushCommand_InitGfx,
+ BerryCrushCommand_TeardownGfx,
+ BerryCrushCommand_SignalReadyToBegin,
+ BerryCrushCommand_AskPickBerry,
+ BerryCrushCommand_GoToBerryPouch,
+ BerryCrushCommand_WaitForOthersToPickBerries,
+ BerryCrushCommand_DropBerriesIntoCrusher,
+ BerryCrushCommand_DropLid,
+ BerryCrushCommand_Countdown,
+ BerryCrushCommand_PlayGame_Master,
+ BerryCrushCommand_PlayGame_Slave,
+ BerryCrushCommand_FinishGame,
+ BerryCrushCommand_HandleTimeUp,
+ BerryCrushCommand_TabulateResults,
+ BerryCrushCommand_ShowResults,
+ BerryCrushCommand_SaveGame,
+ BerryCrushCommand_AskPlayAgain,
+ BerryCrushCommand_CommunicatePlayAgainResponses,
+ BerryCrushCommand_FadeOutToPlayAgain,
+ BerryCrushCommand_PlayAgainFailureMessage,
+ BerryCrushCommand_GracefulExit,
+ BerryCrushCommand_Quit,
};
static const u8 gUnknown_082F4434[][4] =
@@ -801,19 +801,19 @@ static const u8 gUnknown_082F4448[] = {3, 7, 15, 31};
struct BerryCrushGame * GetBerryCrushGame(void)
{
- return gBerryCrushGame;
+ return sBerryCrushGamePtr;
}
u32 QuitBerryCrush(MainCallback callback)
{
- if (!gBerryCrushGame)
+ if (!sBerryCrushGamePtr)
return 2;
if (!callback)
- callback = gBerryCrushGame->unk0;
+ callback = sBerryCrushGamePtr->unk0;
- DestroyTask(gBerryCrushGame->mainTask);
- FREE_AND_SET_NULL(gBerryCrushGame);
+ DestroyTask(sBerryCrushGamePtr->mainTask);
+ FREE_AND_SET_NULL(sBerryCrushGamePtr);
SetMainCallback2(callback);
if (callback == CB2_ReturnToField)
{
@@ -850,8 +850,8 @@ void StartBerryCrush(MainCallback callback)
return;
}
- gBerryCrushGame = AllocZeroed(sizeof(*gBerryCrushGame));
- if (!gBerryCrushGame)
+ sBerryCrushGamePtr = AllocZeroed(sizeof(struct BerryCrushGame));
+ if (!sBerryCrushGamePtr)
{
SetMainCallback2(callback);
Rfu.unk_10 = 0;
@@ -860,17 +860,17 @@ void StartBerryCrush(MainCallback callback)
return;
}
- gBerryCrushGame->unk0 = callback;
- gBerryCrushGame->unk8 = multiplayerId;
- gBerryCrushGame->unk9 = playerCount;
- ParseName_Options(gBerryCrushGame);
- gBerryCrushGame->unk12 = 1;
- gBerryCrushGame->unkE = 1;
- gBerryCrushGame->unkF = 6;
- BerryCrush_SetPaletteFadeParams(gBerryCrushGame->unk36, 1, -1, 0, 16, 0, 0);
- sub_8022BEC(4, 1, gBerryCrushGame->unk36);
+ sBerryCrushGamePtr->unk0 = callback;
+ sBerryCrushGamePtr->unk8 = multiplayerId;
+ sBerryCrushGamePtr->unk9 = playerCount;
+ ParseName_Options(sBerryCrushGamePtr);
+ sBerryCrushGamePtr->unk12 = 1;
+ sBerryCrushGamePtr->unkE = 1;
+ sBerryCrushGamePtr->unkF = 6;
+ BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->unk36, 1, -1, 0, 16, 0, 0);
+ BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->unk36);
SetMainCallback2(MainCB);
- gBerryCrushGame->mainTask = CreateTask(MainTask, 8);
+ sBerryCrushGamePtr->mainTask = CreateTask(MainTask, 8);
gTextFlags.autoScroll = 0;
}
@@ -881,18 +881,18 @@ static void GetBerryFromBag(void)
else
RemoveBagItem(gSpecialVar_ItemId, 1);
- gBerryCrushGame->unk98[gBerryCrushGame->unk8].unkC = gSpecialVar_ItemId - FIRST_BERRY_INDEX;
- gBerryCrushGame->unkE = 1;
- gBerryCrushGame->unkF = 9;
- BerryCrush_SetPaletteFadeParams(gBerryCrushGame->unk36, 0, -1, 0, 16, 0, 0);
- sub_8022BEC(4, 1, gBerryCrushGame->unk36);
- gBerryCrushGame->mainTask = CreateTask(MainTask, 8);
+ sBerryCrushGamePtr->unk98[sBerryCrushGamePtr->unk8].unkC = gSpecialVar_ItemId - FIRST_BERRY_INDEX;
+ sBerryCrushGamePtr->unkE = 1;
+ sBerryCrushGamePtr->unkF = 9;
+ BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->unk36, 0, -1, 0, 16, 0, 0);
+ BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->unk36);
+ sBerryCrushGamePtr->mainTask = CreateTask(MainTask, 8);
SetMainCallback2(MainCB);
}
static void BerryCrush_SetupMainTask(void)
{
- DestroyTask(gBerryCrushGame->mainTask);
+ DestroyTask(sBerryCrushGamePtr->mainTask);
ChooseBerryForMachine(GetBerryFromBag);
}
@@ -910,50 +910,50 @@ static void BerryCrush_SaveResults(void)
{
u32 var0, var1;
- var0 = gBerryCrushGame->unk68.unk04;
+ var0 = sBerryCrushGamePtr->unk68.unk04;
var0 = Q_24_8(var0);
var0 = MathUtil_Div32(var0, Q_24_8(60));
- var1 = gBerryCrushGame->unk68.unk0A;
+ var1 = sBerryCrushGamePtr->unk68.unk0A;
var1 = Q_24_8(var1);
var1 = MathUtil_Div32(var1, var0) & 0xFFFF;
- gBerryCrushGame->unk16 = var1;
- switch (gBerryCrushGame->unk9)
+ sBerryCrushGamePtr->unk16 = var1;
+ switch (sBerryCrushGamePtr->unk9)
{
case 2:
- if (gBerryCrushGame->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[0])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[0])
{
- gBerryCrushGame->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = gBerryCrushGame->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sBerryCrushGamePtr->unk16;
}
break;
case 3:
- if (gBerryCrushGame->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[1])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[1])
{
- gBerryCrushGame->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = gBerryCrushGame->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sBerryCrushGamePtr->unk16;
}
break;
case 4:
- if (gBerryCrushGame->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[2])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[2])
{
- gBerryCrushGame->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = gBerryCrushGame->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sBerryCrushGamePtr->unk16;
}
break;
case 5:
- if (gBerryCrushGame->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[3])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[3])
{
- gBerryCrushGame->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = gBerryCrushGame->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sBerryCrushGamePtr->unk16;
}
break;
}
- gBerryCrushGame->unk1C = gBerryCrushGame->unk68.unk00;
- if (GiveBerryPowder(gBerryCrushGame->unk1C))
+ sBerryCrushGamePtr->unk1C = sBerryCrushGamePtr->unk68.unk00;
+ if (GiveBerryPowder(sBerryCrushGamePtr->unk1C))
return;
- gBerryCrushGame->unk25_0 = 1;
+ sBerryCrushGamePtr->unk25_0 = 1;
}
static void VBlankCB(void)
@@ -973,10 +973,10 @@ static void MainCB(void)
static void MainTask(u8 taskId)
{
- if (gBerryCrushGame->unk4)
- gBerryCrushGame->unk4(gBerryCrushGame, gBerryCrushGame->unk36);
+ if (sBerryCrushGamePtr->unk4)
+ sBerryCrushGamePtr->unk4(sBerryCrushGamePtr, sBerryCrushGamePtr->unk36);
- sub_8021450(gBerryCrushGame);
+ sub_8021450(sBerryCrushGamePtr);
}
static void ParseName_Options(struct BerryCrushGame *arg0)
@@ -1104,7 +1104,7 @@ s32 InitBerryCrushDisplay(void)
return 0;
}
-int sub_802130C(void)
+static s32 BerryCrush_TeardownBgs(void)
{
struct BerryCrushGame *var0 = GetBerryCrushGame();
if (!var0)
@@ -1164,13 +1164,13 @@ int sub_802130C(void)
return 0;
}
-static int sub_8021450(struct BerryCrushGame *arg0)
+static s32 sub_8021450(struct BerryCrushGame *arg0)
{
gSpriteCoordOffsetY = arg0->unk2A + arg0->unk2C;
SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);
if (arg0->unk12 == 7)
{
- sub_8022524(&arg0->unk138, arg0->unk28);
+ BerryCrush_PrintTimeOnSprites(&arg0->unk138, arg0->unk28);
}
return 0;
@@ -1184,23 +1184,23 @@ void sub_8021488(struct BerryCrushGame *arg0)
gSpriteCoordOffsetY = -104;
}
-void sub_80214A8(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1)
+static void BerryCrush_CreateBerrySprites(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1)
{
u8 i;
u8 spriteId;
s16 var0, var1;
s16 *data;
- int var3;
+ s32 var3;
s16 var5;
u32 var6;
for (i = 0; i < arg0->unk9; i++)
{
spriteId = AddCustomItemIconSprite(
- &gUnknown_082F436C,
- gUnknown_082F41E8[i],
- gUnknown_082F41E8[i],
- arg0->unk98[i].unkC + 133);
+ &sSpriteTemplate_PlayerBerry,
+ sPlayerBerrySpriteTags[i],
+ sPlayerBerrySpriteTags[i],
+ arg0->unk98[i].unkC + FIRST_BERRY_INDEX);
arg1->unk38[i] = &gSprites[spriteId];
arg1->unk38[i]->oam.priority = 3;
arg1->unk38[i]->affineAnimPaused = TRUE;
@@ -1232,7 +1232,7 @@ void sub_80214A8(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1)
}
}
-void sub_8021608(struct Sprite *sprite)
+static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite)
{
s16 *data = sprite->data;
@@ -1259,13 +1259,13 @@ void sub_8021608(struct Sprite *sprite)
}
}
-void sub_80216A8(struct BerryCrushGame *arg0, __attribute__((unused)) struct BerryCrushGame_138 *arg1)
+void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame *arg0, __attribute__((unused)) struct BerryCrushGame_138 *arg1)
{
u8 i;
for (i = 0; i < arg0->unk9; i++)
{
- FreeSpritePaletteByTag(gUnknown_082F41E8[i]);
- FreeSpriteTilesByTag(gUnknown_082F41E8[i]);
+ FreeSpritePaletteByTag(sPlayerBerrySpriteTags[i]);
+ FreeSpriteTilesByTag(sPlayerBerrySpriteTags[i]);
}
}
@@ -1363,10 +1363,10 @@ bool32 sub_80218D4(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1)
return TRUE;
}
-void sub_8021944(struct BerryCrushGame_138 *arg0, u16 arg1)
+static void FramesToMinSec(struct BerryCrushGame_138 *arg0, u16 arg1)
{
u8 i = 0;
- u32 r7 = 0;
+ u32 fractionalFrames = 0;
s16 r3 = 0;
arg0->unk4 = arg1 / 3600;
@@ -1376,19 +1376,19 @@ void sub_8021944(struct BerryCrushGame_138 *arg0, u16 arg1)
for (i = 0; i < 8; i++)
{
if ((r3 >> (7 - i)) & 1)
- r7 += sPressingSpeedConversionTable[i];
+ fractionalFrames += sPressingSpeedConversionTable[i];
}
- arg0->unk8 = r7 / 1000000;
+ arg0->unk8 = fractionalFrames / 1000000;
}
-void sub_80219C8(u8 windowId, u8 left, u8 colorId, const u8 *string)
+static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string)
{
left = (left * 4) - (GetStringWidth(2, string, -1) / 2u);
AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string);
}
-void sub_8021A28(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 sp18)
+static void PrintBerryCrushResultWindow(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 sp18)
{
u8 r8;
u8 sp1C = 0;
@@ -1458,7 +1458,7 @@ void sub_8021A28(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 sp18)
}
}
-void sub_8021D34(struct BerryCrushGame *r8)
+static void sub_8021D34(struct BerryCrushGame *r8)
{
u8 r10 = 0;
u8 r6 = 0;
@@ -1466,7 +1466,7 @@ void sub_8021D34(struct BerryCrushGame *r8)
struct BerryCrushGame_68 *sp10 = &r8->unk68;
u8 r7 = GetWindowAttribute(r8->unk138.unk82, WINDOW_HEIGHT) * 8 - 42;
- sub_8021944(&r8->unk138, sp10->unk04);
+ FramesToMinSec(&r8->unk138, sp10->unk04);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gText_TimeColon);
r6 = 176 - (u8)GetStringWidth(2, gText_SpaceSec, -1);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gText_SpaceSec);
@@ -1504,7 +1504,7 @@ void sub_8021D34(struct BerryCrushGame *r8)
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gStringVar4);
}
-bool32 sub_8022070(struct BerryCrushGame *r4, struct BerryCrushGame_138 *r6)
+static bool32 sub_8022070(struct BerryCrushGame *r4, struct BerryCrushGame_138 *r6)
{
u8 r5;
struct WindowTemplate template;
@@ -1513,7 +1513,7 @@ bool32 sub_8022070(struct BerryCrushGame *r4, struct BerryCrushGame_138 *r6)
{
case 0:
r5 = r4->unk9 - 2;
- sub_8022554(r6);
+ BerryCrush_HideTimerSprites(r6);
memcpy(&template, &gUnknown_082F3324[r4->unk12 - 11], sizeof(struct WindowTemplate));
if (r4->unk12 == 13)
template.height = gUnknown_082F3344[1][r5];
@@ -1534,18 +1534,18 @@ bool32 sub_8022070(struct BerryCrushGame *r4, struct BerryCrushGame_138 *r6)
switch (r4->unk12)
{
case 11:
- sub_80219C8(r6->unk82, 20, 3, gText_PressesRankings);
- sub_8021A28(r4, 0, 0xA0, 8 * gUnknown_082F3344[0][r5]);
+ PrintTextCentered(r6->unk82, 20, 3, gText_PressesRankings);
+ PrintBerryCrushResultWindow(r4, 0, 0xA0, 8 * gUnknown_082F3344[0][r5]);
r6->unk80 = 5;
return FALSE;
case 12:
- sub_80219C8(r6->unk82, 20, 4, gUnknown_082F43B4[r4->unk68.unk20[0][7] + 3]);
- sub_8021A28(r4, 1, 0xA0, 8 * gUnknown_082F3344[0][r5]);
+ PrintTextCentered(r6->unk82, 20, 4, gUnknown_082F43B4[r4->unk68.unk20[0][7] + 3]);
+ PrintBerryCrushResultWindow(r4, 1, 0xA0, 8 * gUnknown_082F3344[0][r5]);
r6->unk80 = 5;
return FALSE;
case 13:
- sub_80219C8(r6->unk82, 22, 3, gText_CrushingResults);
- sub_8021A28(r4, 2, 0xB0, 8 * gUnknown_082F3344[1][r5]);
+ PrintTextCentered(r6->unk82, 22, 3, gText_CrushingResults);
+ PrintBerryCrushResultWindow(r4, 2, 0xB0, 8 * gUnknown_082F3344[1][r5]);
break;
}
break;
@@ -1561,7 +1561,7 @@ bool32 sub_8022070(struct BerryCrushGame *r4, struct BerryCrushGame_138 *r6)
return FALSE;
}
-void sub_802222C(struct BerryCrushGame *r4)
+static void sub_802222C(struct BerryCrushGame *r4)
{
ClearStdWindowAndFrameToTransparent(r4->unk138.unk82, 1);
RemoveWindow(r4->unk138.unk82);
@@ -1681,15 +1681,15 @@ void ShowBerryCrushRankings(void)
gTasks[taskId].data[5] = gSaveBlock2Ptr->berryCrush.berryCrushResults[3];
}
-void sub_8022524(struct BerryCrushGame_138 *r4, u16 r1)
+static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 *r4, u16 r1)
{
- sub_8021944(r4, r1);
+ FramesToMinSec(r4, r1);
DigitObjUtil_PrintNumOn(0, r4->unk4);
DigitObjUtil_PrintNumOn(1, r4->unk6);
DigitObjUtil_PrintNumOn(2, r4->unk8);
}
-void sub_8022554(struct BerryCrushGame_138 *r0)
+static void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 *r0)
{
r0->unk78[0]->invisible = TRUE;
r0->unk78[1]->invisible = TRUE;
@@ -1698,7 +1698,7 @@ void sub_8022554(struct BerryCrushGame_138 *r0)
DigitObjUtil_HideOrShow(0, 1);
}
-void sub_8022588(struct BerryCrushGame *r5)
+static void sub_8022588(struct BerryCrushGame *r5)
{
u8 r6;
@@ -1711,7 +1711,7 @@ void sub_8022588(struct BerryCrushGame *r5)
}
}
-void sub_8022600(struct BerryCrushGame *r6)
+static void sub_8022600(struct BerryCrushGame *r6)
{
u8 r7;
@@ -1751,7 +1751,7 @@ void sub_8022600(struct BerryCrushGame *r6)
CopyBgTilemapBufferToVram(0);
}
-void sub_80226D0(struct BerryCrushGame *r6)
+static void sub_80226D0(struct BerryCrushGame *r6)
{
u8 r5 = 0;
u8 * r4;
@@ -1772,7 +1772,7 @@ void sub_80226D0(struct BerryCrushGame *r6)
CopyBgTilemapBufferToVram(3);
}
-void sub_8022730(struct BerryCrushGame *r6)
+static void sub_8022730(struct BerryCrushGame *r6)
{
u8 r5 = 0;
u8 r2;
@@ -1834,10 +1834,10 @@ void sub_8022730(struct BerryCrushGame *r6)
DigitObjUtil_CreatePrinter(1, 0, &gUnknown_082F4384[1]);
DigitObjUtil_CreatePrinter(2, 0, &gUnknown_082F4384[2]);
if (r6->unk12 == 1)
- sub_8022554(&r6->unk138);
+ BerryCrush_HideTimerSprites(&r6->unk138);
}
-void sub_8022960(struct BerryCrushGame *r5)
+static void sub_8022960(struct BerryCrushGame *r5)
{
u8 r4 = 0;
@@ -1861,7 +1861,7 @@ void sub_8022960(struct BerryCrushGame *r5)
DestroySprite(r5->unk138.unk20);
}
-static void sub_8022A20(struct Sprite *sprite)
+static void SpriteCB_BerryCrushImpact(struct Sprite *sprite)
{
if (sprite->animEnded)
{
@@ -1870,7 +1870,7 @@ static void sub_8022A20(struct Sprite *sprite)
}
}
-void sub_8022A4C(struct Sprite *sprite)
+static void sub_8022A4C(struct Sprite *sprite)
{
u8 r1 = 0;
SpriteCallback r5 = SpriteCallbackDummy;
@@ -1884,7 +1884,7 @@ void sub_8022A4C(struct Sprite *sprite)
sprite->callback = r5;
}
-void sub_8022A94(struct Sprite *sprite)
+static void sub_8022A94(struct Sprite *sprite)
{
s16 *r4 = sprite->data;
@@ -1906,7 +1906,7 @@ void sub_8022A94(struct Sprite *sprite)
sprite->callback = sub_8022A4C;
}
-void sub_8022B28(struct Sprite *sprite)
+static void sub_8022B28(struct Sprite *sprite)
{
s16 *r7 = sprite->data;
s16 r4, r5;
@@ -1933,23 +1933,23 @@ void sub_8022B28(struct Sprite *sprite)
sprite->invisible = FALSE;
}
-void sub_8022BEC(u16 r5, u8 r4, u8 *r7)
+static void BerryCrush_RunOrScheduleCommand(u16 r5, u8 r4, u8 *r7)
{
struct BerryCrushGame *r6 = GetBerryCrushGame();
- if (r5 > 25)
+ if (r5 >= ARRAY_COUNT(sBerryCrushCommands))
r5 = 0;
switch (r4)
{
case 0:
if (r5 != 0)
- gUnknown_082F43CC[r5](r6, r7);
- if (r6->unkE > 25)
+ sBerryCrushCommands[r5](r6, r7);
+ if (r6->unkE >= ARRAY_COUNT(sBerryCrushCommands))
r6->unkE = r4;
- r6->unk4 = gUnknown_082F43CC[r6->unkE];
+ r6->unk4 = sBerryCrushCommands[r6->unkE];
break;
case 1:
- r6->unk4 = gUnknown_082F43CC[r5];
+ r6->unk4 = sBerryCrushCommands[r5];
break;
}
}
@@ -1993,7 +1993,7 @@ static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame *game,
return 0;
}
-static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5)
+static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame *r4, u8 *r5)
{
switch (r4->unkC)
{
@@ -2017,7 +2017,7 @@ static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5)
}
return 0;
case 3:
- sub_8022BEC(r4->unkF, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(r4->unkF, 1, NULL);
r4->unkC = 0;
return 0;
default:
@@ -2026,7 +2026,7 @@ static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5)
}
}
-static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5)
+static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame *r7, u8 *r5)
{
u16 r4 = r5[3];
@@ -2062,7 +2062,7 @@ static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5)
case 3:
if (r5[1] & 1)
ClearDialogWindowAndFrame(0, 1);
- sub_8022BEC(r7->unkE, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(r7->unkE, 1, NULL);
r7->unkC = r5[4];
return 0;
}
@@ -2070,21 +2070,21 @@ static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5)
return 0;
}
-static u32 sub_8022E1C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
if (InitBerryCrushDisplay() != 0)
- sub_8022BEC(r4->unkE, 0, r4->unk36);
+ BerryCrush_RunOrScheduleCommand(r4->unkE, 0, r4->unk36);
return 0;
}
-static u32 sub_8022E3C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
- if (sub_802130C() != 0)
- sub_8022BEC(r4->unkE, 0, r4->unk36);
+ if (BerryCrush_TeardownBgs() != 0)
+ BerryCrush_RunOrScheduleCommand(r4->unkE, 0, r4->unk36);
return 0;
}
-static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
switch (r4->unkC)
{
@@ -2095,7 +2095,7 @@ static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
if (IsLinkTaskFinished())
{
PlayNewMapMusic(MUS_RG_GAME_CORNER);
- sub_8022BEC(7, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(7, 1, NULL);
r4->unk12 = 3;
r4->unkC = 0;
}
@@ -2105,7 +2105,7 @@ static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8022EAC(struct BerryCrushGame *r4, u8 *r5)
+static u32 BerryCrushCommand_AskPickBerry(struct BerryCrushGame *r4, u8 *r5)
{
switch (r4->unkC)
{
@@ -2114,36 +2114,36 @@ static u32 sub_8022EAC(struct BerryCrushGame *r4, u8 *r5)
break;
case 0:
sub_8024578(r4);
- sub_8024644(r5, 0, 1, 0, 1);
+ BerryCrush_SetShowMessageParams(r5, 0, 1, 0, 1);
r4->unkE = 7;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
break;
case 1:
r4->unkE = 8;
- sub_8022BEC(5, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(5, 1, NULL);
r4->unkC = 2;
break;
}
return 0;
}
-static u32 sub_8022F04(struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_GoToBerryPouch(struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1)
{
r0->unk4 = NULL;
SetMainCallback2(BerryCrush_SetupMainTask);
return 0;
}
-static u32 sub_8022F1C(struct BerryCrushGame *r5, u8 *r2)
+static u32 BerryCrushCommand_WaitForOthersToPickBerries(struct BerryCrushGame *r5, u8 *r2)
{
u8 r3;
switch (r5->unkC)
{
case 0:
- sub_8024644(r2, 1, 0, 0, 1);
+ BerryCrush_SetShowMessageParams(r2, 1, 0, 0, 1);
r5->unkE = 9;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
return 0;
case 1:
Rfu_SetLinkStandbyCallback();
@@ -2177,7 +2177,7 @@ static u32 sub_8022F1C(struct BerryCrushGame *r5, u8 *r2)
break;
case 5:
ClearDialogWindowAndFrame(0, 1);
- sub_8022BEC(10, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(10, 1, NULL);
r5->unk12 = 4;
r5->unkC = 0;
return 0;
@@ -2186,12 +2186,12 @@ static u32 sub_8022F1C(struct BerryCrushGame *r5, u8 *r2)
return 0;
}
-static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
switch (r4->unkC)
{
case 0:
- sub_80214A8(r4, &r4->unk138);
+ BerryCrush_CreateBerrySprites(r4, &r4->unk138);
Rfu_SetLinkStandbyCallback();
break;
case 1:
@@ -2203,12 +2203,12 @@ static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
r4->unk138.unk3 = 0;
break;
case 2:
- r4->unk138.unk38[r4->unk138.unk0]->callback = sub_8021608;
+ r4->unk138.unk38[r4->unk138.unk0]->callback = SpriteCB_DropBerryIntoCrusher;
r4->unk138.unk38[r4->unk138.unk0]->affineAnimPaused = FALSE;
PlaySE(SE_BALL_THROW);
break;
case 3:
- if (r4->unk138.unk38[r4->unk138.unk0]->callback == sub_8021608)
+ if (r4->unk138.unk38[r4->unk138.unk0]->callback == SpriteCB_DropBerryIntoCrusher)
return 0;
r4->unk138.unk38[r4->unk138.unk0] = NULL;
++r4->unk138.unk0;
@@ -2225,14 +2225,14 @@ static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
r4->unk138.unk0 = 0;
break;
case 5:
- sub_80216A8(r4, &r4->unk138);
+ BerryCrushFreeBerrySpriteGfx(r4, &r4->unk138);
Rfu_SetLinkStandbyCallback();
break;
case 6:
if (!IsLinkTaskFinished())
return 0;
PlaySE(SE_FALL);
- sub_8022BEC(11, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(11, 1, NULL);
r4->unk12 = 5;
r4->unkC = 0;
return 0;
@@ -2241,7 +2241,7 @@ static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
return 0;
}
-static u32 sub_80231B8(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_DropLid(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
switch (r4->unkC)
{
@@ -2279,7 +2279,7 @@ static u32 sub_80231B8(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
case 3:
if (!IsLinkTaskFinished())
return 0;
- sub_8022BEC(12, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(12, 1, NULL);
r4->unk12 = 6;
r4->unkC = 0;
return 0;
@@ -2288,7 +2288,7 @@ static u32 sub_80231B8(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
return 0;
}
-static u32 sub_80232EC(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_Countdown(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
switch (r4-> unkC)
{
@@ -2313,9 +2313,9 @@ static u32 sub_80232EC(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
r4->unk138.unk3 = 0;
r4->unk10 = 0;
if (r4->unk8 == 0)
- sub_8022BEC(13, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(13, 1, NULL);
else
- sub_8022BEC(14, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(14, 1, NULL);
r4->unk12 = 7;
r4->unkC = 0;
return 0;
@@ -2565,7 +2565,7 @@ void sub_802385C(struct BerryCrushGame *r5)
}
}
-static u32 sub_80238F0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_PlayGame_Master(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
memset(&r4->unk5C, 0, sizeof(r4->unk5C));
memset(&r4->unk4E, 0, sizeof(r4->unk4E));
@@ -2578,11 +2578,11 @@ static u32 sub_80238F0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
if (r4->unk28 >= 36000)
{
r4->unk28 = 36000;
- sub_8022BEC(16, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(16, 1, NULL);
}
else
{
- sub_8022BEC(15, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(15, 1, NULL);
}
r4->unk10 = 0;
r4->unkC = 0;
@@ -2598,7 +2598,7 @@ static u32 sub_80238F0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
}
}
-static u32 sub_8023998(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_PlayGame_Slave(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
memset(&r4->unk5C, 0, sizeof(r4->unk5C));
memset(&r4->unk4E, 0, sizeof(r4->unk4E));
@@ -2611,11 +2611,11 @@ static u32 sub_8023998(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
if (r4->unk28 >= 36000)
{
r4->unk28 = 36000;
- sub_8022BEC(16, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(16, 1, NULL);
}
else
{
- sub_8022BEC(15, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(15, 1, NULL);
}
r4->unk10 = 0;
r4->unkC = 0;
@@ -2628,7 +2628,7 @@ static u32 sub_8023998(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
}
}
-static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
switch (r4->unkC)
{
@@ -2676,7 +2676,7 @@ static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
case 5:
if (!IsLinkTaskFinished())
return 0;
- sub_8022BEC(17, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(17, 1, NULL);
r4->unk10 = 0;
r4->unkC = 0;
return 0;
@@ -2685,7 +2685,7 @@ static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6)
+static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame *r5, u8 *r6)
{
switch (r5->unkC)
{
@@ -2714,9 +2714,9 @@ static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6)
if (!IsLinkTaskFinished())
return 0;
ConvertIntToDecimalStringN(gStringVar1, r5->unk1C, STR_CONV_MODE_LEFT_ALIGN, 6);
- sub_8024644(r6, 7, 1, 0, 0);
+ BerryCrush_SetShowMessageParams(r6, 7, 1, 0, 0);
r5->unkE = 19;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unk10 = 0;
r5->unkC = 0;
return 0;
@@ -2725,7 +2725,7 @@ static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6)
return 0;
}
-static u32 sub_8023CAC(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_TabulateResults(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1)
{
u8 r8, r4_, r3;
s32 r2;
@@ -2877,7 +2877,7 @@ static u32 sub_8023CAC(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1
break;
case 7:
BerryCrush_SaveResults();
- sub_8022BEC(18, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(18, 1, NULL);
r7->unk12 = 11;
r7->unkC = 0;
r7->unk24 = 0;
@@ -2887,7 +2887,7 @@ static u32 sub_8023CAC(struct BerryCrushGame *r7, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6)
+static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame *r5, u8 *r6)
{
switch (r5->unkC)
{
@@ -2921,9 +2921,9 @@ static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6)
case 4:
ConvertIntToDecimalStringN(gStringVar1, r5->unk1C, STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar2, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 6);
- sub_8024644(r6, 2, 3, 0, 0);
+ BerryCrush_SetShowMessageParams(r6, 2, 3, 0, 0);
r5->unkE = 19;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unkC = 0;
return 0;
}
@@ -2931,16 +2931,16 @@ static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6)
return 0;
}
-static u32 sub_8024134(struct BerryCrushGame *r5, u8 *r4)
+static u32 BerryCrushCommand_SaveGame(struct BerryCrushGame *r5, u8 *r4)
{
switch (r5->unkC)
{
case 0:
if (r5->unk28 >= 36000)
- sub_8022554(&r5->unk138);
- sub_8024644(r4, 8, 0, 0, 1);
+ BerryCrush_HideTimerSprites(&r5->unk138);
+ BerryCrush_SetShowMessageParams(r4, 8, 0, 0, 1);
r5->unkE = 19;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unkC = 0;
return 0;
case 1:
@@ -2959,7 +2959,7 @@ static u32 sub_8024134(struct BerryCrushGame *r5, u8 *r4)
return 0;
break;
case 4:
- sub_8022BEC(20, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(20, 1, NULL);
r5->unk12 = 15;
r5->unkC = 0;
return 0;
@@ -2968,16 +2968,16 @@ static u32 sub_8024134(struct BerryCrushGame *r5, u8 *r4)
return 0;
}
-static u32 sub_8024228(struct BerryCrushGame *r5, u8 *r6)
+static u32 BerryCrushCommand_AskPlayAgain(struct BerryCrushGame *r5, u8 *r6)
{
s8 r4 = 0;
switch (r5->unkC)
{
case 0:
- sub_8024644(r6, 4, 0, 0, 1);
+ BerryCrush_SetShowMessageParams(r6, 4, 0, 0, 1);
r5->unkE = 20;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unkC = 0; // dunno what it's doing because it's already in case 0
return 0;
case 1:
@@ -3000,9 +3000,9 @@ static u32 sub_8024228(struct BerryCrushGame *r5, u8 *r6)
r5->unk14 = 1;
}
ClearDialogWindowAndFrame(0, 1);
- sub_8024644(r6, 8, 0, 0, 0);
+ BerryCrush_SetShowMessageParams(r6, 8, 0, 0, 0);
r5->unkE = 21;
- sub_8022BEC(3, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unkC = 0;
}
return 0;
@@ -3011,7 +3011,7 @@ static u32 sub_8024228(struct BerryCrushGame *r5, u8 *r6)
return 0;
}
-static u32 sub_80242E0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_CommunicatePlayAgainResponses(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1)
{
u8 r5 = 0;
@@ -3038,9 +3038,9 @@ static u32 sub_80242E0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
for (; r5 < r4->unk9; ++r5)
r4->unk4E[0] += gBlockRecvBuffer[r5][0];
if (r4->unk4E[0] != 0)
- sub_8022BEC(23, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(23, 1, NULL);
else
- sub_8022BEC(22, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(22, 1, NULL);
ResetBlockReceivedFlags();
r4->unk42[0] = 0;
r4->unk4E[0] = 0;
@@ -3052,7 +3052,7 @@ static u32 sub_80242E0(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_80243BC(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
{
switch (r5->unkC)
{
@@ -3073,7 +3073,7 @@ static u32 sub_80243BC(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
case 3:
if (UpdatePaletteFade())
return 0;
- sub_8022BEC(7, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(7, 1, NULL);
r5->unk12 = 3;
r5->unkC = 0;
return 0;
@@ -3082,7 +3082,7 @@ static u32 sub_80243BC(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8024444(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_PlayAgainFailureMessage(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
{
switch (r5->unkC)
{
@@ -3104,7 +3104,7 @@ static u32 sub_8024444(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
--r5->unk138.unk0;
else
{
- sub_8022BEC(24, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(24, 1, NULL);
r5->unkC = 0;
}
return 0;
@@ -3113,7 +3113,7 @@ static u32 sub_8024444(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8024508(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_GracefulExit(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1)
{
switch (r5->unkC)
{
@@ -3129,7 +3129,7 @@ static u32 sub_8024508(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
if (gReceivedRemoteLinkPlayers != 0)
return 0;
r5->unkE = 25;
- sub_8022BEC(5, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(5, 1, NULL);
r5->unkC = 2; // ???
return 0;
}
@@ -3137,13 +3137,13 @@ static u32 sub_8024508(struct BerryCrushGame *r5, __attribute__((unused)) u8 *r1
return 0;
}
-static u32 sub_8024568(__attribute__((unused)) struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1)
+static u32 BerryCrushCommand_Quit(__attribute__((unused)) struct BerryCrushGame *r0, __attribute__((unused)) u8 *r1)
{
QuitBerryCrush(NULL);
return 0;
}
-void sub_8024578(struct BerryCrushGame *r4)
+static void sub_8024578(struct BerryCrushGame *r4)
{
u8 r5 = 0;
@@ -3198,7 +3198,7 @@ static void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter,
params[9] = communicateAfter;
}
-void sub_8024644(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5)
+static void BerryCrush_SetShowMessageParams(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5)
{
u8 sp[4];
diff --git a/src/cable_club.c b/src/cable_club.c
index 77cb0465c..8b321d670 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -1267,7 +1267,8 @@ static void sub_80B3AD0(u8 taskId)
#define tTimer data[1]
-void sub_80B3AF8(u8 taskId)
+// Confirm that all cabled link players are connected
+void Task_ReconnectWithLinkPlayers(u8 taskId)
{
s16 *data = gTasks[taskId].data;
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 12e08a4cc..4f0bf9245 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -44,7 +44,7 @@ static void PrintContestPaintingCaption(u8, u8);
static void VBlankCB_ContestPainting(void);
static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64]);
-extern const u8 gUnknown_0827EA0C[];
+extern const u8 gContestPaintingCaption[];
extern const u8 gContestCoolness[];
extern const u8 gContestBeauty[];
extern const u8 gContestCuteness[];
@@ -297,7 +297,7 @@ static void PrintContestPaintingCaption(u8 contestType, bool8 arg1)
StringCopy(gStringVar2, gContestPaintingWinner->trainerName);
sub_81DB5AC(gStringVar2);
StringCopy(gStringVar3, gContestPaintingWinner->monName);
- StringExpandPlaceholders(gStringVar4, gUnknown_0827EA0C);
+ StringExpandPlaceholders(gStringVar4, gContestPaintingCaption);
}
else
{
diff --git a/src/field_specials.c b/src/field_specials.c
index 9e944a384..86be21eda 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3735,14 +3735,17 @@ bool32 ShouldDistributeEonTicket(void)
return TRUE;
}
-void sub_813B534(void)
+#define tState data[0]
+
+void BattleTowerReconnectLink(void)
{
+ // Save battle type, restored at end
+ // of Task_LinkRetireStatusWithBattleTowerPartner
sBattleTowerMultiBattleTypeFlags = gBattleTypeFlags;
gBattleTypeFlags = 0;
+
if (!gReceivedRemoteLinkPlayers)
- {
- CreateTask(sub_80B3AF8, 5);
- }
+ CreateTask(Task_ReconnectWithLinkPlayers, 5);
}
void LinkRetireStatusWithBattleTowerPartner(void)
@@ -3750,137 +3753,145 @@ void LinkRetireStatusWithBattleTowerPartner(void)
CreateTask(Task_LinkRetireStatusWithBattleTowerPartner, 5);
}
+// Communicate with a Battle Tower link partner to tell them
+// whether or not the player chose to continue or retire,
+// and determine what the partner chose to do
+// gSpecialVar_0x8004: Player's choice
+// gSpecialVar_0x8005: Partner's choice (read from gBlockRecvBuffer[1][0])
static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
{
- switch (gTasks[taskId].data[0])
+ switch (gTasks[taskId].tState)
{
- case 0:
- if (!FuncIsActiveTask(sub_80B3AF8))
+ case 0:
+ if (!FuncIsActiveTask(Task_ReconnectWithLinkPlayers))
+ {
+ gTasks[taskId].tState++;
+ }
+ break;
+ case 1:
+ if (IsLinkTaskFinished() == TRUE)
+ {
+ if (GetMultiplayerId() == 0)
{
- gTasks[taskId].data[0]++;
+ // Player is link leader, skip sending data
+ gTasks[taskId].tState++;
}
- break;
- case 1:
- if (IsLinkTaskFinished() == TRUE)
+ else
{
- if (GetMultiplayerId() == 0)
- {
- gTasks[taskId].data[0]++;
- }
- else
- {
- SendBlock(bitmask_all_link_players_but_self(), &gSpecialVar_0x8004, 2);
- gTasks[taskId].data[0]++;
- }
+ // Send value of gSpecialVar_0x8004 to leader
+ // Will either be BATTLE_TOWER_LINK_CONTINUE or BATTLE_TOWER_LINK_RETIRE
+ SendBlock(bitmask_all_link_players_but_self(), &gSpecialVar_0x8004, sizeof(gSpecialVar_0x8004));
+ gTasks[taskId].tState++;
}
- break;
- case 2:
- if ((GetBlockReceivedStatus() & 2) != 0)
- {
- if (GetMultiplayerId() == 0)
- {
- gSpecialVar_0x8005 = gBlockRecvBuffer[1][0];
- ResetBlockReceivedFlag(1);
- if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
- && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
- {
- gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE;
- }
- else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE
- && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
- {
- gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE;
- }
- else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
- && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE)
- {
- gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE;
- }
- else
- {
- gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_CONTINUE;
- }
- }
- gTasks[taskId].data[0]++;
- }
- break;
- case 3:
- if (IsLinkTaskFinished() == TRUE)
+ }
+ break;
+ case 2:
+ if (GetBlockReceivedStatus() & 2)
+ {
+ if (GetMultiplayerId() == 0)
{
- if (GetMultiplayerId() != 0)
+ // Player is leader, read partner's choice
+ // and determine if play should continue
+ gSpecialVar_0x8005 = gBlockRecvBuffer[1][0];
+ ResetBlockReceivedFlag(1);
+
+ if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
+ && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
{
- gTasks[taskId].data[0]++;
+ gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE;
}
- else
+ else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE
+ && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
{
- SendBlock(bitmask_all_link_players_but_self(), &gSpecialVar_Result, 2);
- gTasks[taskId].data[0]++;
+ gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_MEMBER_RETIRE;
}
- }
- break;
- case 4:
- if ((GetBlockReceivedStatus() & 1) != 0)
- {
- if (GetMultiplayerId() != 0)
+ else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
+ && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE)
{
- gSpecialVar_Result = gBlockRecvBuffer[0][0];
- ResetBlockReceivedFlag(0);
- gTasks[taskId].data[0]++;
+ gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_LEADER_RETIRE;
}
else
{
- gTasks[taskId].data[0]++;
+ gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_CONTINUE;
}
}
- break;
- case 5:
- if (GetMultiplayerId() == 0)
+ gTasks[taskId].tState++;
+ }
+ break;
+ case 3:
+ if (IsLinkTaskFinished() == TRUE)
+ {
+ if (GetMultiplayerId() != 0)
{
- if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE)
- {
- ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
- }
+ // Player is not link leader, wait for leader's response
+ gTasks[taskId].tState++;
}
else
{
- if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE)
- {
- ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
- }
+ // Send whether or not play should continue
+ SendBlock(bitmask_all_link_players_but_self(), &gSpecialVar_Result, sizeof(gSpecialVar_Result));
+ gTasks[taskId].tState++;
}
- gTasks[taskId].data[0]++;
- break;
- case 6:
- if (!IsTextPrinterActive(0))
- {
- gTasks[taskId].data[0]++;
- }
- break;
- case 7:
- if (IsLinkTaskFinished() == 1)
- {
- SetLinkStandbyCallback();
- gTasks[taskId].data[0]++;
- }
- break;
- case 8:
- if (IsLinkTaskFinished() == 1)
+ }
+ break;
+ case 4:
+ if (GetBlockReceivedStatus() & 1)
+ {
+ if (GetMultiplayerId() != 0)
{
- gTasks[taskId].data[0]++;
+ // Player is not link leader, read leader's response
+ gSpecialVar_Result = gBlockRecvBuffer[0][0];
+ ResetBlockReceivedFlag(0);
+ gTasks[taskId].tState++;
}
- break;
- case 9:
- if (gWirelessCommType == 0)
+ else
{
- SetCloseLinkCallback();
+ gTasks[taskId].tState++;
}
- gBattleTypeFlags = sBattleTowerMultiBattleTypeFlags;
- EnableBothScriptContexts();
- DestroyTask(taskId);
- break;
+ }
+ break;
+ case 5:
+ // Print message if partner chose to retire (and player didn't)
+ if (GetMultiplayerId() == 0)
+ {
+ if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_MEMBER_RETIRE)
+ ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
+ }
+ else
+ {
+ if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_LEADER_RETIRE)
+ ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
+ }
+ gTasks[taskId].tState++;
+ break;
+ case 6:
+ if (!IsTextPrinterActive(0))
+ gTasks[taskId].tState++;
+ break;
+ case 7:
+ if (IsLinkTaskFinished() == TRUE)
+ {
+ SetLinkStandbyCallback();
+ gTasks[taskId].tState++;
+ }
+ break;
+ case 8:
+ if (IsLinkTaskFinished() == TRUE)
+ gTasks[taskId].tState++;
+ break;
+ case 9:
+ if (gWirelessCommType == 0)
+ SetCloseLinkCallback();
+
+ gBattleTypeFlags = sBattleTowerMultiBattleTypeFlags;
+ EnableBothScriptContexts();
+ DestroyTask(taskId);
+ break;
}
}
+#undef tState
+
void Script_DoRayquazaScene(void)
{
if (!gSpecialVar_0x8004)
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 7cb9b1bd6..f39ccb74c 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -1425,35 +1425,36 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
sending = ni_or_uni & 0x20;
if (sending || ni_or_uni == 0x40)
{
- u8 *dataType_p; // a hack to swap instructions
-
slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
slotStatus_UNI = NULL;
slotStatus_NI->send.errorCode = 0;
- *slotStatus_NI->send.now_p = dataType_p = &slotStatus_NI->send.dataType;
+ slotStatus_NI->send.now_p[0] = &slotStatus_NI->send.dataType;
slotStatus_NI->send.remainSize = 7;
slotStatus_NI->send.bmSlotOrg = bmSendSlot;
slotStatus_NI->send.bmSlot = bmSendSlot;
slotStatus_NI->send.payloadSize = subFrameSize - frameSize;
if (sending != 0)
- *dataType_p = 0;
+ slotStatus_NI->send.dataType = 0;
else
- *dataType_p = 1;
+ slotStatus_NI->send.dataType = 1;
+
slotStatus_NI->send.dataSize = dataSize;
slotStatus_NI->send.src = src;
slotStatus_NI->send.ack = 0;
slotStatus_NI->send.phase = 0;
- #ifndef NONMATCHING // to fix r2, r3, r4, r5 register roulette
- asm("":::"r2");
- #endif
for (i = 0; i < WINDOW_COUNT; ++i)
{
slotStatus_NI->send.recvAckFlag[i] = 0;
slotStatus_NI->send.n[i] = 1;
}
for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
- if ((bmSendSlot >> bm_slot_id) & 1)
- gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
+ {
+ do
+ {
+ if ((bmSendSlot >> bm_slot_id) & 1)
+ gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
+ } while (0);
+ }
gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
*llFrameSize_p -= subFrameSize;
slotStatus_NI->send.state = SLOT_STATE_SEND_START;
diff --git a/src/main.c b/src/main.c
index 8d6bd94fa..278b93542 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@
#include "intro.h"
#include "main.h"
#include "trainer_hill.h"
+#include "constants/rgb.h"
static void VBlankIntr(void);
static void HBlankIntr(void);
@@ -90,7 +91,7 @@ void AgbMain()
#if !MODERN
RegisterRamReset(RESET_ALL);
#endif //MODERN
- *(vu16 *)BG_PLTT = 0x7FFF;
+ *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup
InitGpuRegManager();
REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3;
InitKeys();
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:46:09 +0000