diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-02 04:27:51 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-02 01:27:51 -0800 |
| commit | 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 (patch) | |
| tree | 9fce5941c31e76acd873ce4610e1bd59bc865d90 /data | |
| parent | e1120f3a62097abb80bfa2f910d98ef53f1e5671 (diff) | |
label and document berry.c, decompress.c, item_use.c and label gBattleTypeFlags (#146)
* make ROM match again
* clean up item_use.c labels and clarify functions.
* label and clarify some functions in decompress.c
* label and clarify berry.c
* rename 20239F8 to gBattleTypeFlags
* formatting
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_83760F0.s | 10 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/data_83760F0.s b/data/data_83760F0.s index 47fb12384..e21f45b0b 100644 --- a/data/data_83760F0.s +++ b/data/data_83760F0.s @@ -7366,7 +7366,7 @@ gUnknown_083CC738:: @ 83CC738 .include "data/berries.inc" .align 2 -gUnknown_083CD780:: @ 83CD780 +gBlankBerryTree:: @ 83CD780 .4byte 0, 0 @ 83CD788 @@ -8850,18 +8850,18 @@ gUnknown_083D61DC:: @ 83D61DC .4byte Unknown_83D61BC .align 2 -gUnknown_083D61E4:: @ 83D61E4 +gExitToOverworldFuncList:: @ 83D61E4 .4byte sub_808B020 .4byte c2_exit_to_overworld_2_switch .4byte sub_810B96C -gUnknown_083D61F0:: @ 83D61F0 +gItemFinderDirections:: @ 83D61F0 .byte DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST .align 2 gUnknown_083D61F4:: @ 83D61F4 .4byte sub_80C9FC0 - .4byte sub_80A5C48 + .4byte CleanUpItemMenuMessage .align 2 gSpriteAnim_83D61FC:: @ 83D61FC @@ -21640,7 +21640,7 @@ gOtherText_CantGetOffBike:: @ 840E929 gOtherText_ItemfinderResponding:: @ 840E94E .string "Oh!\nThe machine’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}$" -gOtherText_ItemfinderFoundItem:: @ 840E992 +gOtherText_ItemfinderItemUnderfoot:: @ 840E992 .string "The machine’s indicating something\nright underfoot!{PAUSE_UNTIL_PRESS}$" gOtherText_NoResponse:: @ 840E9C8 diff --git a/data/specials.inc b/data/specials.inc index 8025e3b80..d2546d6a5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -50,7 +50,7 @@ gSpecials:: .4byte FieldObjectInteractionRemoveBerryTree .4byte FieldObjectInteractionWaterBerryTree .4byte PlayerHasBerries - .4byte sub_80B4940 + .4byte IsEnigmaBerryValid .4byte sub_8082558 .4byte sub_80826D8 .4byte sub_8082718 |