ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
This commit is contained in:
PikalaxALT 2019-04-03 09:55:17 -04:00 committed by huderlem
parent 33ee31b2e0
commit 4fadbaf161
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/event.inc
View File

@ -77,7 +77,7 @@
.endm
@ Executes a script stored in a default RAM location.
.macro gotoram
.macro returnram
.byte 0x0c
.endm
@ -1440,7 +1440,7 @@
.endm
@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020375C0.
.macro execram
.macro gotoram
.byte 0xcf
.endm

2
data/mystery_event_msg.s
View File

@ -36,7 +36,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D
setvaddress MysteryEventScript_SurfPichu
checkflag FLAG_MYSTERY_EVENT_DONE
vgoto_if 0, SurfPichu_GiveIfPossible
gotoram
returnram
SurfPichu_GiveIfPossible: @ 8674D4C
specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount

4
data/script_cmd_table.inc
View File

@ -12,7 +12,7 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_callstd
.4byte ScrCmd_gotostd_if
.4byte ScrCmd_callstd_if
.4byte ScrCmd_gotoram
.4byte ScrCmd_returnram
.4byte ScrCmd_killscript
.4byte ScrCmd_setmysteryeventstatus
.4byte ScrCmd_loadword
@ -207,7 +207,7 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_nop1
.4byte ScrCmd_setmonobedient
.4byte ScrCmd_checkmonobedience
.4byte ScrCmd_cmdCF
.4byte ScrCmd_gotoram
.4byte ScrCmd_nop1
.4byte ScrCmd_warpD1
.4byte ScrCmd_setmonmetlocation

2
data/scripts/cable_club.inc
View File

@ -60,7 +60,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
end
OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19
execram
gotoram
OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A
msgbox gUnknown_08273178, MSGBOX_NPC

2
include/link_rfu.h
View File

@ -284,7 +284,7 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
s32 sub_800E87C(u8 idx);
void sub_8011BA4(void);
void sub_8010198(void);
void LinkRfu_FatalError(void);
bool32 sub_8011A9C(void);
void sub_80104B0(void);
void sub_8011A50(void);

6
include/mevent_client.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_MEVENT_SERVER_ISH_H
#define GUARD_MEVENT_SERVER_ISH_H
#ifndef GUARD_MEVENT_CLIENT_H
#define GUARD_MEVENT_CLIENT_H
#include "mevent_server_helpers.h"
@ -30,4 +30,4 @@ void mevent_client_inc_flag(void);
void * mevent_client_get_buffer(void);
void mevent_client_set_param(u32 a0);
#endif //GUARD_MEVENT_SERVER_ISH_H
#endif //GUARD_MEVENT_CLIENT_H

2
src/link_rfu.c
View File

@ -3674,7 +3674,7 @@ void sub_8010168(void)
gUnknown_03005000.unk_00 = sub_8010148;
}
void sub_8010198(void)
void LinkRfu_FatalError(void)
{
sub_800D630();
gUnknown_03005000.unk_ce4 = 1;

8
src/mevent_server_helpers.c
View File

@ -96,12 +96,12 @@ static bool32 mevent_receive_func(struct mevent_srv_sub * svr)
svr->recvCRC = header.crc;
if (svr->recvSize > ME_SEND_BUF_SIZE)
{
sub_8010198();
LinkRfu_FatalError();
return FALSE;
}
else if (svr->recvIdent != header.ident)
{
sub_8010198();
LinkRfu_FatalError();
return FALSE;
}
else
@ -133,7 +133,7 @@ static bool32 mevent_receive_func(struct mevent_srv_sub * svr)
case 2:
if (CalcCRC16WithTable(svr->recvBfr, svr->recvSize) != svr->recvCRC)
{
sub_8010198();
LinkRfu_FatalError();
return FALSE;
}
else
@ -192,7 +192,7 @@ static bool32 mevent_send_func(struct mevent_srv_sub * svr)
if (IsLinkTaskFinished())
{
if (CalcCRC16WithTable(svr->sendBfr, svr->sendSize) != svr->sendCRC)
sub_8010198();
LinkRfu_FatalError();
else
++svr->seqno;
}

2
src/overworld.c
View File

@ -2287,7 +2287,7 @@ static void SetKeyInterceptCallback(u16 (*func)(u32))
static void CheckRfuKeepAliveTimer(void)
{
if (gWirelessCommType != 0 && ++sRfuKeepAliveTimer > 60)
sub_8010198();
LinkRfu_FatalError();
}
static void ResetAllTradingStates(void)

4
src/scrcmd.c
View File

@ -281,7 +281,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
bool8 ScrCmd_returnram(struct ScriptContext *ctx)
{
ScriptJump(ctx, gUnknown_020375C0);
return FALSE;
@ -2215,7 +2215,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
{
const u8* v1 = GetSavedRamScriptIfValid();

14
sym_ewram.txt
View File

@ -7,16 +7,16 @@
.include "src/link.o"
.include "src/link_rfu.o"
.include "src/union_room.o"
.include "src/mystery_gift.o"
.include "src/union_room_player_avatar.o"
.include "src/union_room_battle.o"
.include "src/mystery_gift.o"
.include "src/union_room_player_avatar.o"
.include "src/union_room_battle.o"
.include "src/mevent2.o"
.include "src/mevent_801BAAC.o"
.include "src/mevent_server.o"
.include "src/mevent_client.o"
.include "src/mevent_server.o"
.include "src/mevent_client.o"
@ union_room_chat
.align 2
@ union_room_chat
.align 2
gUnknown_02022C84: @ 2022C84
.space 0x4