ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 08:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_808D438

Browse Source
This commit is contained in:
scnorton 2017-09-06 09:29:59 -04:00
parent f677873d07
commit a08f11cab3
5 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/field_map_obj.s
View File

@ -5,17 +5,6 @@
.text .text
thumb_func_start sub_808D438
sub_808D438: @ 808D438
push {lr}
bl strange_npc_table_clear
bl npcs_clear_ids_and_state
bl ClearPlayerAvatarInfo
bl sub_808D450
pop {r0}
bx r0
thumb_func_end sub_808D438
thumb_func_start sub_808D450 thumb_func_start sub_808D450
sub_808D450: @ 808D450 sub_808D450: @ 808D450
push {r4-r6,lr} push {r4-r6,lr}

2
include/field_map_obj.h
View File

@ -9,4 +9,6 @@ extern struct MapObject gUnknown_02037350[16];
// Exported ROM declarations // Exported ROM declarations
void sub_808D438(void);
#endif //POKEEMERALD_FIELD_MAP_OBJ_H #endif //POKEEMERALD_FIELD_MAP_OBJ_H

10
include/field_player_avatar.h Normal file
View File

@ -0,0 +1,10 @@
//
// Created by Scott Norton on 9/6/17.
//
#ifndef POKEEMERALD_FIELD_PLAYER_AVATAR_H
#define POKEEMERALD_FIELD_PLAYER_AVATAR_H
void ClearPlayerAvatarInfo(void);
#endif //POKEEMERALD_FIELD_PLAYER_AVATAR_H

7
include/rom4.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef POKEEMERALD_ROM4_H
#define POKEEMERALD_ROM4_H
void strange_npc_table_clear(void);
#endif //POKEEMERALD_ROM4_H

17
src/field_map_obj.c
View File

@ -1,6 +1,9 @@
// Includes // Includes
#include "global.h" #include "global.h"
#include "sprite.h"
#include "rom4.h"
#include "field_player_avatar.h"
#include "field_map_obj.h" #include "field_map_obj.h"
// Static struct declarations // Static struct declarations
@ -9,11 +12,13 @@
// Static ROM declarations // Static ROM declarations
void sub_808D450(void);
// ROM data // ROM data
// Code // Code
void npc_clear_ids_and_state(struct MapObject *mapObject) /*static*/ void npc_clear_ids_and_state(struct MapObject *mapObject)
{ {
memset(mapObject, 0, sizeof(struct MapObject)); memset(mapObject, 0, sizeof(struct MapObject));
mapObject->localId = 0xFF; mapObject->localId = 0xFF;
@ -22,7 +27,7 @@ void npc_clear_ids_and_state(struct MapObject *mapObject)
mapObject->mapobj_unk_1C = -1; mapObject->mapobj_unk_1C = -1;
} }
void npcs_clear_ids_and_state(void) static void npcs_clear_ids_and_state(void)
{ {
u8 i; u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++) for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
@ -30,3 +35,11 @@ void npcs_clear_ids_and_state(void)
npc_clear_ids_and_state(&gUnknown_02037350[i]); npc_clear_ids_and_state(&gUnknown_02037350[i]);
} }
} }
void sub_808D438(void)
{
strange_npc_table_clear();
npcs_clear_ids_and_state();
ClearPlayerAvatarInfo();
sub_808D450();
}