diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
| commit | 204d3e45f0c0843ada1243897d36e873059efde1 (patch) | |
| tree | b4c3fae28387695175f007357848286afbb0a494 /sym_common.txt | |
| parent | 3ed97d94be70bee91b581517311c01cf20c917de (diff) | |
| parent | f1584e69c307427516d2c180ab92e28bc3786326 (diff) | |
Merge remote-tracking branch 'origin/master' into battle-1
Diffstat (limited to 'sym_common.txt')
| -rw-r--r-- | sym_common.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sym_common.txt b/sym_common.txt index 0bc9fd80c..07c827de8 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(gContestRngValue, 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 = .; |