Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 05:00:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dumped move range strings

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-02-05 22:12:46 -05:00
parent 5421f4fdf4
commit 7c8572c519
5 changed files with 722 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
data/data_810AE24.s
View File

@ -1290,11 +1290,279 @@ AbilityDescriptionNone:
.global gRangeNames .global gRangeNames
gRangeNames: @ 810CC0C gRangeNames: @ 810CC0C
.incbin "baserom.gba", 0x10CC0C, 0x2F4 .4byte 0x810AE1C
.4byte MoveRangeThreeTilesDiagonally
.4byte MoveRangeOneTileFoe
.4byte MoveRangeCutsCornersFoe
.4byte MoveRangeFloorMembers
.4byte MoveRangeFloorMembers
.4byte MoveRangeFloorPokemon
.4byte MoveRangeFloorFoes
.4byte MoveRangeFloorMembers
.4byte MoveRangeSideFoe
.4byte MoveRangeSpecial
.4byte MoveRangeFrontFoe
.4byte MoveRangeSide
.4byte MoveRangeTwoTilesFoe
.4byte MoveRangeStraightLine
.4byte MoveRangeRoomFoes
.4byte MoveRangeRoomAllies
.4byte MoveRangeRoom
.4byte MoveRangeRoomExceptUser
.4byte MoveRangeUser
.4byte MoveRangeUser
.4byte MoveRangeUser
.4byte MoveRangeRoomOnly
.4byte MoveRangeItems
.4byte MoveRangeFloor
.4byte MoveRangeWall
.4byte MoveRangeOneTile
.4byte MoveRangeTwoTiles
.4byte MoveRangeCutsCorners
.4byte MoveRangeFloor
.4byte MoveRangeFront
.4byte MoveRange31
.4byte MoveRange32
.4byte MoveRange33
.4byte MoveRange34
.4byte MoveRange35
.4byte MoveRange36
.4byte MoveRange37
.4byte MoveRange38
.4byte MoveRange39
.4byte MoveRange40
.4byte MoveRange41
.4byte MoveRange42
.4byte MoveRange43
.4byte MoveRange44
.4byte MoveRange45
.4byte MoveRange46
.4byte MoveRange47
.4byte MoveRange48
.global MoveRange48
MoveRange48:
.string "48\0"
.align 2,0
.global MoveRange47
MoveRange47:
.string "47\0"
.align 2,0
.global MoveRange46
MoveRange46:
.string "46\0"
.align 2,0
.global MoveRange45
MoveRange45:
.string "45\0"
.align 2,0
.global MoveRange44
MoveRange44:
.string "44\0"
.align 2,0
.global MoveRange43
MoveRange43:
.string "43\0"
.align 2,0
.global MoveRange42
MoveRange42:
.string "42\0"
.align 2,0
.global MoveRange41
MoveRange41:
.string "41\0"
.align 2,0
.global MoveRange40
MoveRange40:
.string "40\0"
.align 2,0
.global MoveRange39
MoveRange39:
.string "39\0"
.align 2,0
.global MoveRange38
MoveRange38:
.string "38\0"
.align 2,0
.global MoveRange37
MoveRange37:
.string "37\0"
.align 2,0
.global MoveRange36
MoveRange36:
.string "36\0"
.align 2,0
.global MoveRange35
MoveRange35:
.string "35\0"
.align 2,0
.global MoveRange34
MoveRange34:
.string "34\0"
.align 2,0
.global MoveRange33
MoveRange33:
.string "33\0"
.align 2,0
.global MoveRange32
MoveRange32:
.string "32\0"
.align 2,0
.global MoveRange31
MoveRange31:
.string "31\0"
.align 2,0
.global MoveRangeFront
MoveRangeFront:
.string "Pokémon in front\0"
.align 2,0
.global MoveRangeCutsCorners
MoveRangeCutsCorners:
.string "User{COMMA} cuts corners\0"
.align 2,0
.global MoveRangeTwoTiles
MoveRangeTwoTiles:
.string "Pokémon within 2-tile range\0"
.align 2,0
.global MoveRangeOneTile
MoveRangeOneTile:
.string "Pokémon within 1-tile range\0"
.align 2,0
.global MoveRangeWall
MoveRangeWall:
.string "Wall\0"
.align 2,0
.global MoveRangeFloor
MoveRangeFloor:
.string "Floor\0"
.align 2,0
.global MoveRangeItems
MoveRangeItems:
.string "Items\0"
.align 2,0
.global MoveRangeRoomOnly
MoveRangeRoomOnly:
.string "Members in room only\0"
.align 2,0
.global MoveRangeUser
MoveRangeUser:
.string "User\0"
.align 2,0
.global MoveRangeRoomExceptUser
MoveRangeRoomExceptUser:
.string "All in room except user\0"
.align 2,0
.global MoveRangeRoom
MoveRangeRoom:
.string "All Pokémon in room\0"
.align 2,0
.global MoveRangeRoomAllies
MoveRangeRoomAllies:
.string "Allies in room\0"
.align 2,0
.global MoveRangeRoomFoes
MoveRangeRoomFoes:
.string "Foes in room\0"
.align 2,0
.global MoveRangeStraightLine
MoveRangeStraightLine:
.string "Straight line\0"
.align 2,0
.global MoveRangeTwoTilesFoe
MoveRangeTwoTilesFoe:
.string "Foe up to 2 tiles ahead\0"
.align 2,0
.global MoveRangeSide
MoveRangeSide:
.string "Pokémon at side\0"
.align 2,0
.global MoveRangeFrontFoe
MoveRangeFrontFoe:
.string "Foe in front\0"
.align 2,0
.global MoveRangeSpecial
MoveRangeSpecial:
.string "Special\0"
.align 2,0
.global MoveRangeSideFoe
MoveRangeSideFoe:
.string "Foe at side\0"
.align 2,0
.global MoveRangeFloorFoes
MoveRangeFloorFoes:
.string "Foes on floor\0"
.align 2,0
.global MoveRangeFloorPokemon
MoveRangeFloorPokemon:
.string "Pokémon on floor\0"
.align 2,0
.global MoveRangeFloorMembers
MoveRangeFloorMembers:
.string "Members on floor\0"
.align 2,0
.global MoveRangeCutsCornersFoe
MoveRangeCutsCornersFoe:
.string "Foe in front{COMMA} cuts corners\0"
.align 2,0
.global MoveRangeOneTileFoe
MoveRangeOneTileFoe:
.string "Foes within 1-tile range\0"
.align 2,0
.global MoveRangeThreeTilesDiagonally
MoveRangeThreeTilesDiagonally:
.string "3 tiles diagonally and in front\0"
.align 2,0
.global RangeText
RangeText:
.string "Range#=@.{ARG_POKEMON_0} \0"
.align 2,0
.global gUnknown_810CF00 .global gUnknown_810CF00
gUnknown_810CF00: @ 810CF00 gUnknown_810CF00: @ 810CF00
.byte 0xF0, 0xCE, 0x10, 0x08 @ (pointer to range string) .4byte RangeText
.global TypeText .global TypeText
TypeText: TypeText:

826
data/move/move_data.json
View File

File diff suppressed because it is too large Load Diff

1
data_move.mk
View File

@ -5,6 +5,7 @@ MOVE_DATA = $(MOVE_DIR)/move_data.inc
# Headers included by tools/dungeonjson/dungeonjson.cpp:generate_move_data_text # Headers included by tools/dungeonjson/dungeonjson.cpp:generate_move_data_text
MOVE_DATA_INC = \ MOVE_DATA_INC = \
include/constants/move_range.h \
include/constants/type.h include/constants/type.h
data_move: $(MOVE_DATA); data_move: $(MOVE_DATA);

36
include/constants/move_range.h Normal file
View File

@ -0,0 +1,36 @@
#ifndef GUARD_CONSTANTS_MOVE_RANGE_H
#define GUARD_CONSTANTS_MOVE_RANGE_H
#define MOVE_RANGE_NONE 0
#define MOVE_RANGE_THREE_TILES_DIAGONALLY 1
#define MOVE_RANGE_ONE_TILE_FOE 2
#define MOVE_RANGE_CUTS_CORNERS_FOE 3
#define MOVE_RANGE_FLOOR_MEMBERS 4
#define MOVE_RANGE_FLOOR_MEMBERS_2 5
#define MOVE_RANGE_FLOOR_POKEMON 6
#define MOVE_RANGE_FLOOR_FOES 7
#define MOVE_RANGE_FLOOR_MEMBERS_3 8
#define MOVE_RANGE_SIDE_FOE 9
#define MOVE_RANGE_SPECIAL 10
#define MOVE_RANGE_FRONT_FOE 11
#define MOVE_RANGE_SIDE 12
#define MOVE_RANGE_TWO_TILES_FOE 13
#define MOVE_RANGE_STRAIGHT_LINE 14
#define MOVE_RANGE_ROOM_FOES 15
#define MOVE_RANGE_ROOM_ALLIES 16
#define MOVE_RANGE_ROOM 17
#define MOVE_RANGE_ROOM_EXCEPT_USER 18
#define MOVE_RANGE_USER 19
#define MOVE_RANGE_USER_2 20
#define MOVE_RANGE_USER_3 21
#define MOVE_RANGE_ROOM_ONLY 22
#define MOVE_RANGE_ITEMS 23
#define MOVE_RANGE_FLOOR 24
#define MOVE_RANGE_WALL 25
#define MOVE_RANGE_ONE_TILE 26
#define MOVE_RANGE_TWO_TILES 27
#define MOVE_RANGE_CUTS_CORNERS 28
#define MOVE_RANGE_FLOOR_2 29
#define MOVE_RANGE_FRONT 30
#endif

3
tools/dungeonjson/dungeonjson.cpp
View File

@ -687,6 +687,7 @@ string generate_move_data_text(Json data) {
ostringstream text; ostringstream text;
text << "@ This is auto-generated by move_data.json.\n"; text << "@ This is auto-generated by move_data.json.\n";
text << "#include \"constants/move_range.h\"\n";
text << "#include \"constants/type.h\"\n"; text << "#include \"constants/type.h\"\n";
text << ".global gMoveData\n"; text << ".global gMoveData\n";
text << "gMoveData:"; text << "gMoveData:";
@ -711,7 +712,7 @@ string generate_move_data_text(Json data) {
<< read_json_bool(data_entry["usesMouth"]) << read_json_bool(data_entry["usesMouth"])
<< read_json_bool(data_entry["cannotHitFrozen"]) << read_json_bool(data_entry["cannotHitFrozen"])
<< read_json_bool(data_entry["ignoresTaunted"]) << read_json_bool(data_entry["ignoresTaunted"])
<< read_json_int(data_entry["rangeID"], 1) << read_json_string(data_entry["rangeID"], 1)
<< "\n.2byte 0" << "\n.2byte 0"
<< read_json_string(data_entry["description"], 4) << read_json_string(data_entry["description"], 4)
<< read_json_string(data_entry["useText"], 4); << read_json_string(data_entry["useText"], 4);