Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nonmatching after merge

Browse Source
This commit is contained in:
AnonymousRandomPerson 2024-10-18 20:51:21 -04:00
parent 1999f0b9eb
commit f2e7f20772
11 changed files with 41 additions and 42320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

628
asm/include/main_020257FC.inc
View File

@ -1,59 +1,14 @@
#pragma once
.public ADVANCED_MENU_DEFAULT_WINDOW_PARAMS
.public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS
.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
.public ADVENTURE_LOG_PTR
.public ALERT_BOX_DEFAULT_WINDOW_PARAMS
.public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
.public ARM9_UNKNOWN_DATA__NA_209E6BC
.public ARM9_UNKNOWN_PTR__NA_20A2C84
.public ARM9_UNKNOWN_TABLE__NA_209E12C
.public ARM9_UNKNOWN_TABLE__NA_209E164
.public ARM9_UNKNOWN_TABLE__NA_209E280
.public ARM9_UNKNOWN_TABLE__NA_20A20B0
.public AddItemToStorage
.public AddMoneyCarried
.public AnalyzeText
.public ArrayCopy32
.public ArrayFill32
.public BAG_CAPACITY_TABLE
.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES
.public BAG_ITEMS_PTR_MIRROR
.public CLIENT_LEVEL_TABLE
.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
.public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
.public CanMonsterUseMove
.public CardBackupError
.public CardPullOutWithStatus
.public ConvertStorageItemAtIdxToItem
.public CountNbOfItemsInStorage
.public CountNbOfValidItemsInStorage
.public CountNbOfValidItemsInTimeDarknessInStorage
.public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
.public DEFAULT_HERO_ID
.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
.public DUNGEON_DATA_LIST
.public DUNGEON_PTR
.public DUNGEON_RESTRICTIONS
.public Debug_FatalError
.public Debug_GetDebugFlag
.public Debug_GetLogFlag
.public Debug_Print
.public Debug_Print0
.public Debug_SetDebugFlag
.public Debug_SetLogFlag
.public DecompressAtHalf
.public DecompressAtNormalVeneer
.public DexNumbersEqual
.public DirectoryFileMngr_OpenDirectoryFile
.public DisableIqSkill
.public DrawTileGrid
.public DungeonSwapIdToIdx
.public DungeonSwapIdxToId
.public DungeonToGroundMoveset
.public EnableAllLearnableIqSkills
.public FORBIDDEN_FORGOT_MOVE_LIST
.public FemaleToMaleForm
.public FileClose
.public FileRom_HandleOpen
.public FileRom_HandleRead
@ -61,171 +16,44 @@
.public FileRom_InitDataTransfer
.public FileRom_StopDataTransfer
.public FileRom_Veneer_FileInit
.public FormatMoveStringMore
.public GAME_MODE
.public GLOBAL_PROGRESS_PTR
.public GUEST_MONSTER_DATA
.public GetActiveRosterIndex
.public GetActiveTeamMember
.public GetActualSellPrice
.public GetAtSize
.public GetCurrentBagCapacity
.public GetDungeonModeSpecial
.public GetDungeonResultString
.public GetEvolutionPossibilities
.public GetHeldButtons
.public GetHero
.public GetHeroMemberIdx
.public GetInfoGroundMoveset
.public GetInfoMoveGround
.public GetIqSkillStringId
.public GetItemAtIdx
.public GetItemCategory
.public GetItemCategoryVeneer
.public GetItemIdFromList
.public GetItemMoveId16
.public GetKeyM2NSwitch
.public GetKeyN2MSwitch
.public GetLanguage
.public GetLanguageType
.public GetLearnableIqSkills
.public GetMainCharacter1MemberIdx
.public GetMainCharacter2MemberIdx
.public GetMainCharacter3MemberIdx
.public GetMaxPp
.public GetMoneyCarried
.public GetMoneyStored
.public GetMonsterName
.public GetMoveRangeId
.public GetMoveType
.public GetMovesetEggPtr
.public GetMovesetHmTmPtr
.public GetMovesetIdx__02013CAC
.public GetMovesetLevelUpPtr
.public GetNbItemsInBag
.public GetNbMoves
.public GetNextIqSkill
.public GetPartner
.public GetPartnerMemberIdx
.public GetPartyMembers
.public GetPpIncrease
.public GetPressedButtons
.public GetReleasedStylus
.public GetRngSeed
.public GetSosMailCount
.public GetStringFromFile
.public GetTeamMember
.public GetTime
.public GroundToDungeonMoveset
.public HIDDEN_POWER_BASE_POWER_TABLE
.public HandleSir0Translation
.public InitAnimationControlWithSet__0201C0B0
.public InitMove
.public InitPortraitParams
.public InitPreprocessorArgs
.public InitRender3dElement64
.public IqSkillFlagTest
.public Is2TurnsMove
.public IsExclusiveItemIdForMonster
.public IsExperienceLocked
.public IsGummi
.public IsItemInTimeDarkness
.public IsItemValidVeneer
.public IsMainCharacter
.public IsMovesetValidInTimeDarkness
.public IsNot2TurnsMoveOrSketch
.public IsRealMove
.public IsShoppableItem
.public IsStorableItem
.public IsStorageFull
.public IsThrownItem
.public IsTreasureBox
.public IsValidTeamMember
.public ItemZInit
.public KAOMADO_FILEPATH
.public KEYBOARD_STRING_IDS
.public IsValidPortrait
.public KeyWaitInit
.public LearnMoves
.public LoadFileFromRom
.public LoadOverlay
.public LoadPortrait
.public LoadWanTableEntry
.public LoadWteFromRom
.public MISSION_FLOORS_FORBIDDEN
.public MISSION_FLOOR_RANKS_PTRS
.public MONSTER_SPRITE_DATA
.public MemAlloc
.public MemFree
.public MemZero
.public Memcpy32
.public MemcpySimple
.public MemsetSimple
.public NOTIFY_NOTE
.public NormalizeTreasureBox
.public OPTIONS_MENU_DEFAULT_WINDOW_PARAMS
.public OS_GetLockID
.public OUTLAW_LEVEL_TABLE
.public OUTLAW_MINION_LEVEL_TABLE
.public OverlayIsLoaded
.public PARENT_MENU_DEFAULT_WINDOW_PARAMS
.public PARTNER_TALK_KIND_TABLE
.public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS
.public PORTRAIT_LAYOUTS
.public PlayBgmByIdVeneer
.public PlaySeVolumeWrapper
.public PointsToZero
.public PreprocessString
.public PreprocessStringFromId
.public RANK_UP_TABLE
.public Rand16Bit
.public Rand32Bit
.public RandInt
.public RandIntSafe
.public ReadItemsFromSave
.public ReadMonsterInfoFromSave
.public RemoveActiveMembersFromAllTeams
.public RemoveActiveMembersFromRescueTeam
.public RemoveActiveMembersFromSpecialEpisodeTeam
.public RemoveEmptyItemsInBag
.public SCRIPT_VARS
.public SCRIPT_VARS_LOCALS
.public SCROLL_BOX_DEFAULT_WINDOW_PARAMS
.public SECONDARY_TERRAIN_TYPES
.public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
.public SPECIAL_EPISODE_MAIN_CHARACTERS
.public STATUSES_FULL_DESCRIPTION_STRING_IDS
.public SetActiveInventory
.public SetActiveKecleonShop
.public SetActiveTeam
.public SetAnimationForAnimationControl
.public SetMoneyCarried
.public SetMoneyStored
.public SetRngSeed
.public SetSpriteIdForAnimationControl
.public SetTeamSetupHeroAndPartnerOnly
.public SortItemsInBag
.public SortItemsInStorage
.public StrcpyName
.public StrcpySimple
.public StrncmpSimple
.public StrncpyName
.public StrncpySimple
.public StrncpySimpleNoPad
.public StrncpySimpleNoPadSafe
.public TBL_TALK_GROUP_STRING_ID_START
.public TEAM_MEMBER_TABLE_PTR
.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
.public TryPointCameraToMonster
.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
.public UnloadFile
.public UnloadOverlay
.public VERSION_EXCLUSIVE_MONSTERS
.public WAN_TABLE
.public WONDER_MAIL_BITS_MAP
.public WONDER_MAIL_BITS_SWAP
.public WONDER_MAIL_ENCRYPTION_TABLE
.public WriteItemsToSave
.public WriteMonsterInfoToSave
.public ZInit8
.public _0209AAD8
.public _0209AB60
.public _0209AB9C
@ -279,243 +107,11 @@
.public _0209B07C
.public _0209B084
.public _0209B08C
.public _0209B09C
.public _0209B09C_EU
.public _0209B0EC
.public _0209B0FC
.public _0209B10C
.public _0209B11C
.public _0209B134
.public _0209B1B8
.public _0209B1C8
.public _0209B1D8
.public _0209B1F0
.public _0209B208
.public _0209B218
.public _0209B228
.public _0209B244
.public _0209B254
.public _0209B264
.public _0209B288
.public _0209B28C
.public _0209B298
.public _0209B2B8
.public _0209B2C4
.public _0209B2D0
.public _0209B2DC
.public _0209B2E0
.public _0209B2E1
.public _0209B2E2
.public _0209B2E3
.public _0209B2EC
.public _0209B2FC
.public _0209B30C
.public _0209B31C
.public _0209B32C
.public _0209B32C_JP
.public _0209B32E
.public _0209B3B4
.public _0209B3B6
.public _0209B408_JP
.public _0209B488
.public _0209B48C
.public _0209B4A4
.public _0209B4AC
.public _0209B4B8
.public _0209B4C0
.public _0209B4C4
.public _0209B4D4
.public _0209B4E4
.public _0209B4FC
.public _0209B50C
.public _0209B548_JP
.public _0209C29C_JP
.public _0209C29D_JP
.public _0209C29E_JP
.public _0209C5C0
.public _0209C5D0
.public _0209C5E0
.public _0209C604
.public _0209C60C
.public _0209C618
.public _0209C628
.public _0209C638
.public _0209C648
.public _0209C658
.public _0209C668
.public _0209C678
.public _0209C688
.public _0209C6B8
.public _0209C70C
.public _0209C764
.public _0209C798
.public _0209C7B8
.public _0209C7CC
.public _0209C7D4
.public _0209C7E4
.public _0209C7F4
.public _0209C820
.public _0209C82C
.public _0209C83C
.public _0209C844
.public _0209C846
.public _0209C850
.public _0209C85C
.public _0209C86C
.public _0209C884
.public _0209C89C
.public _0209C8A8
.public _0209C8B8
.public _0209C8C8
.public _0209C928
.public _0209C92C
.public _0209C93C
.public _0209C94C
.public _0209C95C
.public _0209C96C
.public _0209C97C
.public _0209C98C
.public _0209C99C
.public _0209C9AC
.public _0209C9B0
.public _0209C9CC
.public _0209C9D4
.public _0209C9DC
.public _0209C9E4
.public _0209C9F4
.public _0209C9FC
.public _0209CA08
.public _0209CA18
.public _0209CA2C
.public _0209CA3C
.public _0209CA48
.public _0209CA58
.public _0209CA68
.public _0209CA78
.public _0209CA88
.public _0209CA98
.public _0209CAB4
.public _0209CB0C
.public _0209CB3C
.public _0209CB4C
.public _0209CB6C
.public _0209CB78
.public _0209CB88
.public _0209CB98
.public _0209CBA8
.public _0209CBB0
.public _0209CBB8
.public _0209CBC0
.public _0209CBC8
.public _0209CBD0
.public _0209CBD8
.public _0209CBE0
.public _0209CBE8
.public _0209CC0C
.public _0209CC18
.public _0209CC28
.public _0209CC38
.public _0209CC48
.public _0209CC60
.public _0209CC80
.public _0209CC90
.public _0209CCA0
.public _0209CCB0
.public _0209CCC0
.public _0209CCD0
.public _0209CCE0
.public _0209CD4C
.public _0209CD6C
.public _0209CD84
.public _0209CD94
.public _0209CDA4
.public _0209CDB8
.public _0209CDD0
.public _0209CDE0
.public _0209CDF8
.public _0209CE10
.public _0209CE40
.public _0209CE50
.public _0209CE54
.public _0209CE58
.public _0209CE68
.public _0209CE78
.public _0209CE88
.public _0209CE89
.public _0209CEAC
.public _0209CF0C
.public _0209CF28
.public _0209CF48
.public _0209CF64
.public _0209CF84
.public _0209DF70
.public _0209DFA0
.public _0209DFC8
.public _0209DFE8
.public _0209E008
.public _0209E010
.public _0209E011
.public _0209E264
.public _0209E3A1
.public _0209E3A2
.public _0209E3A3
.public _0209E6BD
.public _0209E912
.public _020A0C68
.public _020A0C69
.public _020A0C6A
.public _020A0C6C
.public _020A0C6E
.public _020A1864
.public _020A1880
.public _020A1884
.public _020A189C
.public _020A18C0
.public _020A192C
.public _020A20B1
.public _020A2808
.public _020A281C
.public _020A2830
.public _020A2844
.public _020A2858
.public _020A286C
.public _020A2880
.public _020A2894
.public _020A28A8
.public _020A28E0
.public _020A2904
.public _020A2928
.public _020A294C
.public _020A2970
.public _020A2994
.public _020A29B8
.public _020A29DC
.public _020A2A00
.public _020A2A24
.public _020A2A48
.public _020A2A6C
.public _020A2A90
.public _020A2AB4
.public _020A2AD8
.public _020A2AFC
.public _020A2B20
.public _020A2D09
.public _020A31B8
.public _020A31D4
.public _020A31E4
.public _020A31F4
.public _020A31FC
.public _020A3200
.public _020A3210
.public _020A322C
.public _020A3248
.public _020A3258
.public _020A327C
.public _020A328C
.public _020A32D4
.public _020A32F8
.public _020A3330
.public _020A45C8_JP
.public _020AFC70
.public _020AFCEC
.public _020AFCF0
@ -534,56 +130,6 @@
.public _020AFDA8
.public _020AFDAC
.public _020AFDB8
.public _020AFDBC
.public _020AFDD0
.public _020AFDD8
.public _020AFDE0
.public _020AFDE8
.public _020AFDF0
.public _020AFE40
.public _020AFE58
.public _020AFE5C
.public _020AFE70
.public _020AFE74
.public _020AFE78
.public _020AFE7C
.public _020AFE8C
.public _020AFE90
.public _020AFE98
.public _020AFEA8
.public _020AFEB4
.public _020AFEC8
.public _020AFECC
.public _020AFED0
.public _020AFED4
.public _020AFED8
.public _020AFEDC
.public _020AFEE0
.public _020AFEE4
.public _020AFEE8
.public _020AFEEC
.public _020AFEF4
.public _020AFF00
.public _020AFF14
.public _020AFF38
.public _020AFF40
.public _020AFF4C
.public _020AFF54
.public _020AFF5C
.public _020AFF64
.public _020AFF68
.public _020AFF6C
.public _020AFF7C
.public _020AFF80
.public _020AFF88
.public _020B09B0
.public _020B09B4
.public _020B09C0
.public _020B09C8
.public _020B09D0
.public _020B12A0_JP
.public _020B12F4_EU
.public _020B1308_EU
.public _022A59B8
.public _022A59C0
.public _022A5A08
@ -625,127 +171,30 @@
.public _022AACFC
.public _022AAD78
.public _022AAD7C
.public _022AADF8
.public _022AADFC
.public _022AAE00
.public _022AAE2A
.public _022AAE2E
.public _022AAE4C
.public _022AAE58
.public _022AAE64
.public _022AAE68
.public _022AAE70
.public _022AAE74
.public _022AAE78
.public _022AAEA4
.public _022AAEA8
.public _022AAEAC
.public _022AB09C
.public _022AB0A0
.public _022AB0A1
.public _022AB0A2
.public _022AB0A9
.public _022AB0AC
.public _022AB4AC
.public _022AB4B0
.public _022AB4F8
.public _022AB4FC
.public _022AB510
.public _022AB518
.public _022AB5A8
.public _022AB5AC
.public _022AB694
.public _022AB69C
.public _022AB918
.public _022AB924
.public _022AB92C
.public _022AB930
.public _022ABDE0
.public _f2d
.public _fsub
.public _s32_div_f
.public memcpy
.public memset
.public ov11_022E6E68
.public ov11_023061CC
.public ov11_023061E4
.public ov11_02306C64
.public ov11_02306C9C
.public ov11_0230D000
.public ov11_0230D220
.public ov11_0230D71C
.public ov11_0230D92C
.public ov11_02310BDC
.public ov11_02310C18
.public ov29_022E2A78
.public ov29_022EA62C
.public ov29_023002F0
.public ov29_02347100
.public sprintf
.public strcat
.public strcpy
.public strlen
.public strncmp
.public strncpy
.public sub_01FF8F28
.public sub_01FF905C
.public sub_01FF9128
.public sub_01FF9130_JP
.public sub_01FF929C
.public sub_02001808
.public sub_02002580
.public sub_020027F8
.public sub_0200302C
.public sub_020030FC
.public sub_02003B94
.public sub_02003BC8
.public sub_02004F80
.public sub_020063A0
.public sub_020063F4
.public sub_02006498
.public sub_02006BFC
.public sub_02006C8C
.public sub_0200A124
.public sub_0200A158
.public sub_0200A174
.public sub_0200A184
.public sub_0200A29C
.public sub_0200A478
.public sub_0200A4C4
.public sub_0200A504
.public sub_0200A510
.public sub_0200A590
.public sub_0200B2C4
.public sub_0200B314
.public sub_0200B330
.public sub_0200B340
.public sub_0200B3C0
.public sub_0200B3D4
.public sub_0200B3FC
.public sub_0200C4CC
.public sub_0200C5DC
.public sub_0200CABC
.public sub_0200CAD4
.public sub_0200CAE4
.public sub_0200D310
.public sub_0200D65C
.public sub_0200D670
.public sub_0200FD48
.public sub_02010044
.public sub_02010060
.public sub_02010154
.public sub_0201077C
.public sub_02010794
.public sub_020107F4
.public sub_02012AB8
.public sub_02013190
.public sub_020131F0
.public sub_02013E54
.public sub_02013F58
.public sub_02015090
.public sub_02017C50
.public sub_02017C74
.public sub_02017C80
.public sub_0201C028
.public sub_0201C108
.public sub_0201CF5C
@ -754,9 +203,6 @@
.public sub_0201E12C
.public sub_0201E13C
.public sub_0201F2A0
.public sub_0202059C
.public sub_020205C0
.public sub_0202065C
.public sub_02020A9C
.public sub_02020B14
.public sub_02020B4C
@ -774,67 +220,7 @@
.public sub_02021F44
.public sub_0202202C
.public sub_02022118
.public sub_020236FC
.public sub_0202372C
.public sub_02024B94
.public sub_02024D7C
.public sub_020251F0
.public sub_02025304_JP
.public sub_02054F18
.public sub_02054FB8
.public sub_02054FEC
.public sub_02055020
.public sub_020550DC
.public sub_020550E0
.public sub_02055118
.public sub_02055B78
.public sub_02055D4C
.public sub_020560B8
.public sub_02056228
.public sub_0205633C
.public sub_02056360
.public sub_02056410
.public sub_02056460
.public sub_020564B0
.public sub_02056504
.public sub_020568A4
.public sub_02056B58
.public sub_02056BD4
.public sub_02056F60
.public sub_02058460
.public sub_020584F8
.public sub_020584FC
.public sub_020597B0
.public sub_02059A74
.public sub_02059B08
.public sub_0205A4B4
.public sub_0205B028
.public sub_0205B0A0
.public sub_0205B0B8
.public sub_0205B478
.public sub_0205B77C
.public sub_0205BB7C
.public sub_0205BD14
.public sub_0205BD9C
.public sub_0205BFB0
.public sub_0205C2A4
.public sub_0205C548
.public sub_0205C75C
.public sub_0205EE40
.public sub_0205F00C
.public sub_0205FAB0
.public sub_0205FC20
.public sub_0205FD88
.public sub_0205FE80
.public sub_02062B64
.public sub_0206637C
.public sub_02079094
.public sub_0207B9EC
.public sub_0208346C
.public sub_0208347C
.public sub_02083A18
.public sub_02083B00
.public sub_02083B14
.public sub_02083B3C
.public sub_02084304
.public vsprintf
.public sub_0203C984
.public sub_020469BC
.public sub_02048240
.public sub_0204AE60

2
asm/include/overlay_31_02382FBC.inc
View File

@ -221,7 +221,6 @@
.public ov29_0238280C
.public ov31_02382B54
.public ov31_02382DAC
.public ov31_02382F68
.public ov31_02389E22
.public ov31_02389F5C
.public ov31_0238A044
@ -247,6 +246,7 @@
.public ov31_0238A23C
.public ov31_0238A2A0
.public ov31_0238A2A8
.public StairsSubheadingCallback
.public strcpy
.public sub_02001808
.public sub_0200B3D4

41054
asm/main_020257FC.s
View File

File diff suppressed because it is too large Load Diff

7
asm/overlay_31_02382FBC.s
View File

@ -1,10 +1,11 @@
.include "asm/macros.inc"
.include "overlay_31002382FBC.inc"
.include "overlay_31_02382FBC.inc"
.text
arm_func_start ov31_02382FBC
ov31_02382FBC: ; 0x02382FBC
; https://decomp.me/scratch/D2RFJ
arm_func_start HandleStairsMenu
HandleStairsMenu: ; 0x02382FBC
stmdb sp!, {r4, lr}
sub sp, sp, #0x138
ldr r0, _02383218 ; =ov31_0238A2A0

611
include/monster_id.h
View File

@ -1,611 +0,0 @@
#ifndef PMDSKY_MONSTER_ID_H
#define PMDSKY_MONSTER_ID_H
#define _MONSTER_ID_GENDERED(name, base_value) \
MONSTER_##name = base_value, MONSTER_##name##_SECONDARY = base_value + 600
enum monster_id {
_MONSTER_ID_GENDERED(NONE, 0),
_MONSTER_ID_GENDERED(BULBASAUR, 1),
_MONSTER_ID_GENDERED(IVYSAUR, 2),
_MONSTER_ID_GENDERED(VENUSAUR, 3),
_MONSTER_ID_GENDERED(CHARMANDER, 4),
_MONSTER_ID_GENDERED(CHARMELEON, 5),
_MONSTER_ID_GENDERED(CHARIZARD, 6),
_MONSTER_ID_GENDERED(SQUIRTLE, 7),
_MONSTER_ID_GENDERED(WARTORTLE, 8),
_MONSTER_ID_GENDERED(BLASTOISE, 9),
_MONSTER_ID_GENDERED(CATERPIE, 10),
_MONSTER_ID_GENDERED(METAPOD, 11),
_MONSTER_ID_GENDERED(BUTTERFREE, 12),
_MONSTER_ID_GENDERED(WEEDLE, 13),
_MONSTER_ID_GENDERED(KAKUNA, 14),
_MONSTER_ID_GENDERED(BEEDRILL, 15),
_MONSTER_ID_GENDERED(PIDGEY, 16),
_MONSTER_ID_GENDERED(PIDGEOTTO, 17),
_MONSTER_ID_GENDERED(PIDGEOT, 18),
_MONSTER_ID_GENDERED(RATTATA, 19),
_MONSTER_ID_GENDERED(RATICATE, 20),
_MONSTER_ID_GENDERED(SPEAROW, 21),
_MONSTER_ID_GENDERED(FEAROW, 22),
_MONSTER_ID_GENDERED(EKANS, 23),
_MONSTER_ID_GENDERED(ARBOK, 24),
_MONSTER_ID_GENDERED(PIKACHU, 25),
_MONSTER_ID_GENDERED(RAICHU, 26),
_MONSTER_ID_GENDERED(SANDSHREW, 27),
_MONSTER_ID_GENDERED(SANDSLASH, 28),
_MONSTER_ID_GENDERED(NIDORAN_F, 29),
_MONSTER_ID_GENDERED(NIDORINA, 30),
_MONSTER_ID_GENDERED(NIDOQUEEN, 31),
_MONSTER_ID_GENDERED(NIDORAN_M, 32),
_MONSTER_ID_GENDERED(NIDORINO, 33),
_MONSTER_ID_GENDERED(NIDOKING, 34),
_MONSTER_ID_GENDERED(CLEFAIRY, 35),
_MONSTER_ID_GENDERED(CLEFABLE, 36),
_MONSTER_ID_GENDERED(VULPIX, 37),
_MONSTER_ID_GENDERED(NINETALES, 38),
_MONSTER_ID_GENDERED(JIGGLYPUFF, 39),
_MONSTER_ID_GENDERED(WIGGLYTUFF, 40),
_MONSTER_ID_GENDERED(ZUBAT, 41),
_MONSTER_ID_GENDERED(GOLBAT, 42),
_MONSTER_ID_GENDERED(ODDISH, 43),
_MONSTER_ID_GENDERED(GLOOM, 44),
_MONSTER_ID_GENDERED(VILEPLUME, 45),
_MONSTER_ID_GENDERED(PARAS, 46),
_MONSTER_ID_GENDERED(PARASECT, 47),
_MONSTER_ID_GENDERED(VENONAT, 48),
_MONSTER_ID_GENDERED(VENOMOTH, 49),
_MONSTER_ID_GENDERED(DIGLETT, 50),
_MONSTER_ID_GENDERED(DUGTRIO, 51),
_MONSTER_ID_GENDERED(MEOWTH, 52),
_MONSTER_ID_GENDERED(PERSIAN, 53),
_MONSTER_ID_GENDERED(PSYDUCK, 54),
_MONSTER_ID_GENDERED(GOLDUCK, 55),
_MONSTER_ID_GENDERED(MANKEY, 56),
_MONSTER_ID_GENDERED(PRIMEAPE, 57),
_MONSTER_ID_GENDERED(GROWLITHE, 58),
_MONSTER_ID_GENDERED(ARCANINE, 59),
_MONSTER_ID_GENDERED(POLIWAG, 60),
_MONSTER_ID_GENDERED(POLIWHIRL, 61),
_MONSTER_ID_GENDERED(POLIWRATH, 62),
_MONSTER_ID_GENDERED(ABRA, 63),
_MONSTER_ID_GENDERED(KADABRA, 64),
_MONSTER_ID_GENDERED(ALAKAZAM, 65),
_MONSTER_ID_GENDERED(MACHOP, 66),
_MONSTER_ID_GENDERED(MACHOKE, 67),
_MONSTER_ID_GENDERED(MACHAMP, 68),
_MONSTER_ID_GENDERED(BELLSPROUT, 69),
_MONSTER_ID_GENDERED(WEEPINBELL, 70),
_MONSTER_ID_GENDERED(VICTREEBEL, 71),
_MONSTER_ID_GENDERED(TENTACOOL, 72),
_MONSTER_ID_GENDERED(TENTACRUEL, 73),
_MONSTER_ID_GENDERED(GEODUDE, 74),
_MONSTER_ID_GENDERED(GRAVELER, 75),
_MONSTER_ID_GENDERED(GOLEM, 76),
_MONSTER_ID_GENDERED(PONYTA, 77),
_MONSTER_ID_GENDERED(RAPIDASH, 78),
_MONSTER_ID_GENDERED(SLOWPOKE, 79),
_MONSTER_ID_GENDERED(SLOWBRO, 80),
_MONSTER_ID_GENDERED(MAGNEMITE, 81),
_MONSTER_ID_GENDERED(MAGNETON, 82),
_MONSTER_ID_GENDERED(FARFETCHD, 83),
_MONSTER_ID_GENDERED(DODUO, 84),
_MONSTER_ID_GENDERED(DODRIO, 85),
_MONSTER_ID_GENDERED(SEEL, 86),
_MONSTER_ID_GENDERED(DEWGONG, 87),
_MONSTER_ID_GENDERED(GRIMER, 88),
_MONSTER_ID_GENDERED(MUK, 89),
_MONSTER_ID_GENDERED(SHELLDER, 90),
_MONSTER_ID_GENDERED(CLOYSTER, 91),
_MONSTER_ID_GENDERED(GASTLY, 92),
_MONSTER_ID_GENDERED(HAUNTER, 93),
_MONSTER_ID_GENDERED(GENGAR, 94),
_MONSTER_ID_GENDERED(ONIX, 95),
_MONSTER_ID_GENDERED(DROWZEE, 96),
_MONSTER_ID_GENDERED(HYPNO, 97),
_MONSTER_ID_GENDERED(KRABBY, 98),
_MONSTER_ID_GENDERED(KINGLER, 99),
_MONSTER_ID_GENDERED(VOLTORB, 100),
_MONSTER_ID_GENDERED(ELECTRODE, 101),
_MONSTER_ID_GENDERED(EXEGGCUTE, 102),
_MONSTER_ID_GENDERED(EXEGGUTOR, 103),
_MONSTER_ID_GENDERED(CUBONE, 104),
_MONSTER_ID_GENDERED(MAROWAK, 105),
_MONSTER_ID_GENDERED(HITMONLEE, 106),
_MONSTER_ID_GENDERED(HITMONCHAN, 107),
_MONSTER_ID_GENDERED(LICKITUNG, 108),
_MONSTER_ID_GENDERED(KOFFING, 109),
_MONSTER_ID_GENDERED(WEEZING, 110),
_MONSTER_ID_GENDERED(RHYHORN, 111),
_MONSTER_ID_GENDERED(RHYDON, 112),
_MONSTER_ID_GENDERED(CHANSEY, 113),
_MONSTER_ID_GENDERED(TANGELA, 114),
_MONSTER_ID_GENDERED(KANGASKHAN, 115),
_MONSTER_ID_GENDERED(HORSEA, 116),
_MONSTER_ID_GENDERED(SEADRA, 117),
_MONSTER_ID_GENDERED(GOLDEEN, 118),
_MONSTER_ID_GENDERED(SEAKING, 119),
_MONSTER_ID_GENDERED(STARYU, 120),
_MONSTER_ID_GENDERED(STARMIE, 121),
_MONSTER_ID_GENDERED(MR_MIME, 122),
_MONSTER_ID_GENDERED(SCYTHER, 123),
_MONSTER_ID_GENDERED(JYNX, 124),
_MONSTER_ID_GENDERED(ELECTABUZZ, 125),
_MONSTER_ID_GENDERED(MAGMAR, 126),
_MONSTER_ID_GENDERED(PINSIR, 127),
_MONSTER_ID_GENDERED(TAUROS, 128),
_MONSTER_ID_GENDERED(MAGIKARP, 129),
_MONSTER_ID_GENDERED(GYARADOS, 130),
_MONSTER_ID_GENDERED(LAPRAS, 131),
_MONSTER_ID_GENDERED(DITTO, 132),
_MONSTER_ID_GENDERED(EEVEE, 133),
_MONSTER_ID_GENDERED(VAPOREON, 134),
_MONSTER_ID_GENDERED(JOLTEON, 135),
_MONSTER_ID_GENDERED(FLAREON, 136),
_MONSTER_ID_GENDERED(PORYGON, 137),
_MONSTER_ID_GENDERED(OMANYTE, 138),
_MONSTER_ID_GENDERED(OMASTAR, 139),
_MONSTER_ID_GENDERED(KABUTO, 140),
_MONSTER_ID_GENDERED(KABUTOPS, 141),
_MONSTER_ID_GENDERED(AERODACTYL, 142),
_MONSTER_ID_GENDERED(SNORLAX, 143),
_MONSTER_ID_GENDERED(ARTICUNO, 144),
_MONSTER_ID_GENDERED(ZAPDOS, 145),
_MONSTER_ID_GENDERED(MOLTRES, 146),
_MONSTER_ID_GENDERED(DRATINI, 147),
_MONSTER_ID_GENDERED(DRAGONAIR, 148),
_MONSTER_ID_GENDERED(DRAGONITE, 149),
_MONSTER_ID_GENDERED(MEWTWO, 150),
_MONSTER_ID_GENDERED(MEW, 151),
_MONSTER_ID_GENDERED(CHIKORITA, 152),
_MONSTER_ID_GENDERED(BAYLEEF, 153),
_MONSTER_ID_GENDERED(MEGANIUM, 154),
_MONSTER_ID_GENDERED(CYNDAQUIL, 155),
_MONSTER_ID_GENDERED(QUILAVA, 156),
_MONSTER_ID_GENDERED(TYPHLOSION, 157),
_MONSTER_ID_GENDERED(TOTODILE, 158),
_MONSTER_ID_GENDERED(CROCONAW, 159),
_MONSTER_ID_GENDERED(FERALIGATR, 160),
_MONSTER_ID_GENDERED(SENTRET, 161),
_MONSTER_ID_GENDERED(FURRET, 162),
_MONSTER_ID_GENDERED(HOOTHOOT, 163),
_MONSTER_ID_GENDERED(NOCTOWL, 164),
_MONSTER_ID_GENDERED(LEDYBA, 165),
_MONSTER_ID_GENDERED(LEDIAN, 166),
_MONSTER_ID_GENDERED(SPINARAK, 167),
_MONSTER_ID_GENDERED(ARIADOS, 168),
_MONSTER_ID_GENDERED(CROBAT, 169),
_MONSTER_ID_GENDERED(CHINCHOU, 170),
_MONSTER_ID_GENDERED(LANTURN, 171),
_MONSTER_ID_GENDERED(PICHU, 172),
_MONSTER_ID_GENDERED(CLEFFA, 173),
_MONSTER_ID_GENDERED(IGGLYBUFF, 174),
_MONSTER_ID_GENDERED(TOGEPI, 175),
_MONSTER_ID_GENDERED(TOGETIC, 176),
_MONSTER_ID_GENDERED(NATU, 177),
_MONSTER_ID_GENDERED(XATU, 178),
_MONSTER_ID_GENDERED(MAREEP, 179),
_MONSTER_ID_GENDERED(FLAAFFY, 180),
_MONSTER_ID_GENDERED(AMPHAROS, 181),
_MONSTER_ID_GENDERED(BELLOSSOM, 182),
_MONSTER_ID_GENDERED(MARILL, 183),
_MONSTER_ID_GENDERED(AZUMARILL, 184),
_MONSTER_ID_GENDERED(SUDOWOODO, 185),
_MONSTER_ID_GENDERED(POLITOED, 186),
_MONSTER_ID_GENDERED(HOPPIP, 187),
_MONSTER_ID_GENDERED(SKIPLOOM, 188),
_MONSTER_ID_GENDERED(JUMPLUFF, 189),
_MONSTER_ID_GENDERED(AIPOM, 190),
_MONSTER_ID_GENDERED(SUNKERN, 191),
_MONSTER_ID_GENDERED(SUNFLORA, 192),
_MONSTER_ID_GENDERED(YANMA, 193),
_MONSTER_ID_GENDERED(WOOPER, 194),
_MONSTER_ID_GENDERED(QUAGSIRE, 195),
_MONSTER_ID_GENDERED(ESPEON, 196),
_MONSTER_ID_GENDERED(UMBREON, 197),
_MONSTER_ID_GENDERED(MURKROW, 198),
_MONSTER_ID_GENDERED(SLOWKING, 199),
_MONSTER_ID_GENDERED(MISDREAVUS, 200),
_MONSTER_ID_GENDERED(UNOWN_A, 201),
_MONSTER_ID_GENDERED(UNOWN_B, 202),
_MONSTER_ID_GENDERED(UNOWN_C, 203),
_MONSTER_ID_GENDERED(UNOWN_D, 204),
_MONSTER_ID_GENDERED(UNOWN_E, 205),
_MONSTER_ID_GENDERED(UNOWN_F, 206),
_MONSTER_ID_GENDERED(UNOWN_G, 207),
_MONSTER_ID_GENDERED(UNOWN_H, 208),
_MONSTER_ID_GENDERED(UNOWN_I, 209),
_MONSTER_ID_GENDERED(UNOWN_J, 210),
_MONSTER_ID_GENDERED(UNOWN_K, 211),
_MONSTER_ID_GENDERED(UNOWN_L, 212),
_MONSTER_ID_GENDERED(UNOWN_M, 213),
_MONSTER_ID_GENDERED(UNOWN_N, 214),
_MONSTER_ID_GENDERED(UNOWN_O, 215),
_MONSTER_ID_GENDERED(UNOWN_P, 216),
_MONSTER_ID_GENDERED(UNOWN_Q, 217),
_MONSTER_ID_GENDERED(UNOWN_R, 218),
_MONSTER_ID_GENDERED(UNOWN_S, 219),
_MONSTER_ID_GENDERED(UNOWN_T, 220),
_MONSTER_ID_GENDERED(UNOWN_U, 221),
_MONSTER_ID_GENDERED(UNOWN_V, 222),
_MONSTER_ID_GENDERED(UNOWN_W, 223),
_MONSTER_ID_GENDERED(UNOWN_X, 224),
_MONSTER_ID_GENDERED(UNOWN_Y, 225),
_MONSTER_ID_GENDERED(UNOWN_Z, 226),
_MONSTER_ID_GENDERED(UNOWN_EXCLAMATION, 227),
_MONSTER_ID_GENDERED(UNOWN_QUESTION, 228),
_MONSTER_ID_GENDERED(WOBBUFFET, 229),
_MONSTER_ID_GENDERED(GIRAFARIG, 230),
_MONSTER_ID_GENDERED(PINECO, 231),
_MONSTER_ID_GENDERED(FORRETRESS, 232),
_MONSTER_ID_GENDERED(DUNSPARCE, 233),
_MONSTER_ID_GENDERED(GLIGAR, 234),
_MONSTER_ID_GENDERED(STEELIX, 235),
_MONSTER_ID_GENDERED(SNUBBULL, 236),
_MONSTER_ID_GENDERED(GRANBULL, 237),
_MONSTER_ID_GENDERED(QWILFISH, 238),
_MONSTER_ID_GENDERED(SCIZOR, 239),
_MONSTER_ID_GENDERED(SHUCKLE, 240),
_MONSTER_ID_GENDERED(HERACROSS, 241),
_MONSTER_ID_GENDERED(SNEASEL, 242),
_MONSTER_ID_GENDERED(TEDDIURSA, 243),
_MONSTER_ID_GENDERED(URSARING, 244),
_MONSTER_ID_GENDERED(SLUGMA, 245),
_MONSTER_ID_GENDERED(MAGCARGO, 246),
_MONSTER_ID_GENDERED(SWINUB, 247),
_MONSTER_ID_GENDERED(PILOSWINE, 248),
_MONSTER_ID_GENDERED(CORSOLA, 249),
_MONSTER_ID_GENDERED(REMORAID, 250),
_MONSTER_ID_GENDERED(OCTILLERY, 251),
_MONSTER_ID_GENDERED(DELIBIRD, 252),
_MONSTER_ID_GENDERED(MANTINE, 253),
_MONSTER_ID_GENDERED(SKARMORY, 254),
_MONSTER_ID_GENDERED(HOUNDOUR, 255),
_MONSTER_ID_GENDERED(HOUNDOOM, 256),
_MONSTER_ID_GENDERED(KINGDRA, 257),
_MONSTER_ID_GENDERED(PHANPY, 258),
_MONSTER_ID_GENDERED(DONPHAN, 259),
_MONSTER_ID_GENDERED(PORYGON2, 260),
_MONSTER_ID_GENDERED(STANTLER, 261),
_MONSTER_ID_GENDERED(SMEARGLE, 262),
_MONSTER_ID_GENDERED(TYROGUE, 263),
_MONSTER_ID_GENDERED(HITMONTOP, 264),
_MONSTER_ID_GENDERED(SMOOCHUM, 265),
_MONSTER_ID_GENDERED(ELEKID, 266),
_MONSTER_ID_GENDERED(MAGBY, 267),
_MONSTER_ID_GENDERED(MILTANK, 268),
_MONSTER_ID_GENDERED(BLISSEY, 269),
_MONSTER_ID_GENDERED(RAIKOU, 270),
_MONSTER_ID_GENDERED(ENTEI, 271),
_MONSTER_ID_GENDERED(SUICUNE, 272),
_MONSTER_ID_GENDERED(LARVITAR, 273),
_MONSTER_ID_GENDERED(PUPITAR, 274),
_MONSTER_ID_GENDERED(TYRANITAR, 275),
_MONSTER_ID_GENDERED(LUGIA, 276),
_MONSTER_ID_GENDERED(HO_OH, 277),
_MONSTER_ID_GENDERED(CELEBI, 278),
_MONSTER_ID_GENDERED(SHINY_CELEBI, 279),
_MONSTER_ID_GENDERED(TREECKO, 280),
_MONSTER_ID_GENDERED(GROVYLE, 281),
_MONSTER_ID_GENDERED(SCEPTILE, 282),
_MONSTER_ID_GENDERED(TORCHIC, 283),
_MONSTER_ID_GENDERED(COMBUSKEN, 284),
_MONSTER_ID_GENDERED(BLAZIKEN, 285),
_MONSTER_ID_GENDERED(MUDKIP, 286),
_MONSTER_ID_GENDERED(MARSHTOMP, 287),
_MONSTER_ID_GENDERED(SWAMPERT, 288),
_MONSTER_ID_GENDERED(POOCHYENA, 289),
_MONSTER_ID_GENDERED(MIGHTYENA, 290),
_MONSTER_ID_GENDERED(ZIGZAGOON, 291),
_MONSTER_ID_GENDERED(LINOONE, 292),
_MONSTER_ID_GENDERED(WURMPLE, 293),
_MONSTER_ID_GENDERED(SILCOON, 294),
_MONSTER_ID_GENDERED(BEAUTIFLY, 295),
_MONSTER_ID_GENDERED(CASCOON, 296),
_MONSTER_ID_GENDERED(DUSTOX, 297),
_MONSTER_ID_GENDERED(LOTAD, 298),
_MONSTER_ID_GENDERED(LOMBRE, 299),
_MONSTER_ID_GENDERED(LUDICOLO, 300),
_MONSTER_ID_GENDERED(SEEDOT, 301),
_MONSTER_ID_GENDERED(NUZLEAF, 302),
_MONSTER_ID_GENDERED(SHIFTRY, 303),
_MONSTER_ID_GENDERED(TAILLOW, 304),
_MONSTER_ID_GENDERED(SWELLOW, 305),
_MONSTER_ID_GENDERED(WINGULL, 306),
_MONSTER_ID_GENDERED(PELIPPER, 307),
_MONSTER_ID_GENDERED(RALTS, 308),
_MONSTER_ID_GENDERED(KIRLIA, 309),
_MONSTER_ID_GENDERED(GARDEVOIR, 310),
_MONSTER_ID_GENDERED(SURSKIT, 311),
_MONSTER_ID_GENDERED(MASQUERAIN, 312),
_MONSTER_ID_GENDERED(SHROOMISH, 313),
_MONSTER_ID_GENDERED(BRELOOM, 314),
_MONSTER_ID_GENDERED(SLAKOTH, 315),
_MONSTER_ID_GENDERED(VIGOROTH, 316),
_MONSTER_ID_GENDERED(SLAKING, 317),
_MONSTER_ID_GENDERED(NINCADA, 318),
_MONSTER_ID_GENDERED(NINJASK, 319),
_MONSTER_ID_GENDERED(SHEDINJA, 320),
_MONSTER_ID_GENDERED(WHISMUR, 321),
_MONSTER_ID_GENDERED(LOUDRED, 322),
_MONSTER_ID_GENDERED(EXPLOUD, 323),
_MONSTER_ID_GENDERED(MAKUHITA, 324),
_MONSTER_ID_GENDERED(HARIYAMA, 325),
_MONSTER_ID_GENDERED(AZURILL, 326),
_MONSTER_ID_GENDERED(NOSEPASS, 327),
_MONSTER_ID_GENDERED(SKITTY, 328),
_MONSTER_ID_GENDERED(DELCATTY, 329),
_MONSTER_ID_GENDERED(SABLEYE, 330),
_MONSTER_ID_GENDERED(MAWILE, 331),
_MONSTER_ID_GENDERED(ARON, 332),
_MONSTER_ID_GENDERED(LAIRON, 333),
_MONSTER_ID_GENDERED(AGGRON, 334),
_MONSTER_ID_GENDERED(MEDITITE, 335),
_MONSTER_ID_GENDERED(MEDICHAM, 336),
_MONSTER_ID_GENDERED(ELECTRIKE, 337),
_MONSTER_ID_GENDERED(MANECTRIC, 338),
_MONSTER_ID_GENDERED(PLUSLE, 339),
_MONSTER_ID_GENDERED(MINUN, 340),
_MONSTER_ID_GENDERED(VOLBEAT, 341),
_MONSTER_ID_GENDERED(ILLUMISE, 342),
_MONSTER_ID_GENDERED(ROSELIA, 343),
_MONSTER_ID_GENDERED(GULPIN, 344),
_MONSTER_ID_GENDERED(SWALOT, 345),
_MONSTER_ID_GENDERED(CARVANHA, 346),
_MONSTER_ID_GENDERED(SHARPEDO, 347),
_MONSTER_ID_GENDERED(WAILMER, 348),
_MONSTER_ID_GENDERED(WAILORD, 349),
_MONSTER_ID_GENDERED(NUMEL, 350),
_MONSTER_ID_GENDERED(CAMERUPT, 351),
_MONSTER_ID_GENDERED(TORKOAL, 352),
_MONSTER_ID_GENDERED(SPOINK, 353),
_MONSTER_ID_GENDERED(GRUMPIG, 354),
_MONSTER_ID_GENDERED(SPINDA, 355),
_MONSTER_ID_GENDERED(TRAPINCH, 356),
_MONSTER_ID_GENDERED(VIBRAVA, 357),
_MONSTER_ID_GENDERED(FLYGON, 358),
_MONSTER_ID_GENDERED(CACNEA, 359),
_MONSTER_ID_GENDERED(CACTURNE, 360),
_MONSTER_ID_GENDERED(SWABLU, 361),
_MONSTER_ID_GENDERED(ALTARIA, 362),
_MONSTER_ID_GENDERED(ZANGOOSE, 363),
_MONSTER_ID_GENDERED(SEVIPER, 364),
_MONSTER_ID_GENDERED(LUNATONE, 365),
_MONSTER_ID_GENDERED(SOLROCK, 366),
_MONSTER_ID_GENDERED(BARBOACH, 367),
_MONSTER_ID_GENDERED(WHISCASH, 368),
_MONSTER_ID_GENDERED(CORPHISH, 369),
_MONSTER_ID_GENDERED(CRAWDAUNT, 370),
_MONSTER_ID_GENDERED(BALTOY, 371),
_MONSTER_ID_GENDERED(CLAYDOL, 372),
_MONSTER_ID_GENDERED(LILEEP, 373),
_MONSTER_ID_GENDERED(CRADILY, 374),
_MONSTER_ID_GENDERED(ANORITH, 375),
_MONSTER_ID_GENDERED(ARMALDO, 376),
_MONSTER_ID_GENDERED(FEEBAS, 377),
_MONSTER_ID_GENDERED(MILOTIC, 378),
_MONSTER_ID_GENDERED(CASTFORM_NORMAL, 379),
_MONSTER_ID_GENDERED(CASTFORM_SNOWY, 380),
_MONSTER_ID_GENDERED(CASTFORM_SUNNY, 381),
_MONSTER_ID_GENDERED(CASTFORM_RAINY, 382),
_MONSTER_ID_GENDERED(KECLEON, 383),
_MONSTER_ID_GENDERED(PURPLE_KECLEON, 384),
_MONSTER_ID_GENDERED(SHUPPET, 385),
_MONSTER_ID_GENDERED(BANETTE, 386),
_MONSTER_ID_GENDERED(DUSKULL, 387),
_MONSTER_ID_GENDERED(DUSCLOPS, 388),
_MONSTER_ID_GENDERED(TROPIUS, 389),
_MONSTER_ID_GENDERED(CHIMECHO, 390),
_MONSTER_ID_GENDERED(ABSOL, 391),
_MONSTER_ID_GENDERED(WYNAUT, 392),
_MONSTER_ID_GENDERED(SNORUNT, 393),
_MONSTER_ID_GENDERED(GLALIE, 394),
_MONSTER_ID_GENDERED(SPHEAL, 395),
_MONSTER_ID_GENDERED(SEALEO, 396),
_MONSTER_ID_GENDERED(WALREIN, 397),
_MONSTER_ID_GENDERED(CLAMPERL, 398),
_MONSTER_ID_GENDERED(HUNTAIL, 399),
_MONSTER_ID_GENDERED(GOREBYSS, 400),
_MONSTER_ID_GENDERED(RELICANTH, 401),
_MONSTER_ID_GENDERED(LUVDISC, 402),
_MONSTER_ID_GENDERED(BAGON, 403),
_MONSTER_ID_GENDERED(SHELGON, 404),
_MONSTER_ID_GENDERED(SALAMENCE, 405),
_MONSTER_ID_GENDERED(BELDUM, 406),
_MONSTER_ID_GENDERED(METANG, 407),
_MONSTER_ID_GENDERED(METAGROSS, 408),
_MONSTER_ID_GENDERED(REGIROCK, 409),
_MONSTER_ID_GENDERED(REGICE, 410),
_MONSTER_ID_GENDERED(REGISTEEL, 411),
_MONSTER_ID_GENDERED(LATIAS, 412),
_MONSTER_ID_GENDERED(LATIOS, 413),
_MONSTER_ID_GENDERED(KYOGRE, 414),
_MONSTER_ID_GENDERED(GROUDON, 415),
_MONSTER_ID_GENDERED(RAYQUAZA, 416),
_MONSTER_ID_GENDERED(JIRACHI, 417),
_MONSTER_ID_GENDERED(DEOXYS_NORMAL, 418),
_MONSTER_ID_GENDERED(DEOXYS_ATTACK, 419),
_MONSTER_ID_GENDERED(DEOXYS_DEFENSE, 420),
_MONSTER_ID_GENDERED(DEOXYS_SPEED, 421),
_MONSTER_ID_GENDERED(TURTWIG, 422),
_MONSTER_ID_GENDERED(GROTLE, 423),
_MONSTER_ID_GENDERED(TORTERRA, 424),
_MONSTER_ID_GENDERED(CHIMCHAR, 425),
_MONSTER_ID_GENDERED(MONFERNO, 426),
_MONSTER_ID_GENDERED(INFERNAPE, 427),
_MONSTER_ID_GENDERED(PIPLUP, 428),
_MONSTER_ID_GENDERED(PRINPLUP, 429),
_MONSTER_ID_GENDERED(EMPOLEON, 430),
_MONSTER_ID_GENDERED(STARLY, 431),
_MONSTER_ID_GENDERED(STARAVIA, 432),
_MONSTER_ID_GENDERED(STARAPTOR, 433),
_MONSTER_ID_GENDERED(BIDOOF, 434),
_MONSTER_ID_GENDERED(BIBAREL, 435),
_MONSTER_ID_GENDERED(KRICKETOT, 436),
_MONSTER_ID_GENDERED(KRICKETUNE, 437),
_MONSTER_ID_GENDERED(SHINX, 438),
_MONSTER_ID_GENDERED(LUXIO, 439),
_MONSTER_ID_GENDERED(LUXRAY, 440),
_MONSTER_ID_GENDERED(BUDEW, 441),
_MONSTER_ID_GENDERED(ROSERADE, 442),
_MONSTER_ID_GENDERED(CRANIDOS, 443),
_MONSTER_ID_GENDERED(RAMPARDOS, 444),
_MONSTER_ID_GENDERED(SHIELDON, 445),
_MONSTER_ID_GENDERED(BASTIODON, 446),
_MONSTER_ID_GENDERED(BURMY_SANDY, 447),
_MONSTER_ID_GENDERED(BURMY_PLANT, 448),
_MONSTER_ID_GENDERED(BURMY_TRASH, 449),
_MONSTER_ID_GENDERED(WORMADAM_SANDY, 450),
_MONSTER_ID_GENDERED(WORMADAM_PLANT, 451),
_MONSTER_ID_GENDERED(WORMADAM_TRASH, 452),
_MONSTER_ID_GENDERED(MOTHIM, 453),
_MONSTER_ID_GENDERED(COMBEE, 454),
_MONSTER_ID_GENDERED(VESPIQUEN, 455),
_MONSTER_ID_GENDERED(PACHIRISU, 456),
_MONSTER_ID_GENDERED(BUIZEL, 457),
_MONSTER_ID_GENDERED(FLOATZEL, 458),
_MONSTER_ID_GENDERED(CHERUBI, 459),
_MONSTER_ID_GENDERED(CHERRIM_OVERCAST, 460),
_MONSTER_ID_GENDERED(CHERRIM_SUNSHINE, 461),
_MONSTER_ID_GENDERED(SHELLOS_EAST, 462),
_MONSTER_ID_GENDERED(SHELLOS_WEST, 463),
_MONSTER_ID_GENDERED(GASTRODON_EAST, 464),
_MONSTER_ID_GENDERED(GASTRODON_WEST, 465),
_MONSTER_ID_GENDERED(AMBIPOM, 466),
_MONSTER_ID_GENDERED(DRIFLOON, 467),
_MONSTER_ID_GENDERED(DRIFBLIM, 468),
_MONSTER_ID_GENDERED(BUNEARY, 469),
_MONSTER_ID_GENDERED(LOPUNNY, 470),
_MONSTER_ID_GENDERED(MISMAGIUS, 471),
_MONSTER_ID_GENDERED(HONCHKROW, 472),
_MONSTER_ID_GENDERED(GLAMEOW, 473),
_MONSTER_ID_GENDERED(PURUGLY, 474),
_MONSTER_ID_GENDERED(CHINGLING, 475),
_MONSTER_ID_GENDERED(STUNKY, 476),
_MONSTER_ID_GENDERED(SKUNTANK, 477),
_MONSTER_ID_GENDERED(BRONZOR, 478),
_MONSTER_ID_GENDERED(BRONZONG, 479),
_MONSTER_ID_GENDERED(BONSLY, 480),
_MONSTER_ID_GENDERED(MIME_JR, 481),
_MONSTER_ID_GENDERED(HAPPINY, 482),
_MONSTER_ID_GENDERED(CHATOT, 483),
_MONSTER_ID_GENDERED(SPIRITOMB, 484),
_MONSTER_ID_GENDERED(GIBLE, 485),
_MONSTER_ID_GENDERED(GABITE, 486),
_MONSTER_ID_GENDERED(GARCHOMP, 487),
_MONSTER_ID_GENDERED(MUNCHLAX, 488),
_MONSTER_ID_GENDERED(RIOLU, 489),
_MONSTER_ID_GENDERED(LUCARIO, 490),
_MONSTER_ID_GENDERED(HIPPOPOTAS, 491),
_MONSTER_ID_GENDERED(HIPPOWDON, 492),
_MONSTER_ID_GENDERED(SKORUPI, 493),
_MONSTER_ID_GENDERED(DRAPION, 494),
_MONSTER_ID_GENDERED(CROAGUNK, 495),
_MONSTER_ID_GENDERED(TOXICROAK, 496),
_MONSTER_ID_GENDERED(CARNIVINE, 497),
_MONSTER_ID_GENDERED(FINNEON, 498),
_MONSTER_ID_GENDERED(LUMINEON, 499),
_MONSTER_ID_GENDERED(MANTYKE, 500),
_MONSTER_ID_GENDERED(SNOVER, 501),
_MONSTER_ID_GENDERED(ABOMASNOW, 502),
_MONSTER_ID_GENDERED(WEAVILE, 503),
_MONSTER_ID_GENDERED(MAGNEZONE, 504),
_MONSTER_ID_GENDERED(LICKILICKY, 505),
_MONSTER_ID_GENDERED(RHYPERIOR, 506),
_MONSTER_ID_GENDERED(TANGROWTH, 507),
_MONSTER_ID_GENDERED(ELECTIVIRE, 508),
_MONSTER_ID_GENDERED(MAGMORTAR, 509),
_MONSTER_ID_GENDERED(TOGEKISS, 510),
_MONSTER_ID_GENDERED(YANMEGA, 511),
_MONSTER_ID_GENDERED(LEAFEON, 512),
_MONSTER_ID_GENDERED(GLACEON, 513),
_MONSTER_ID_GENDERED(GLISCOR, 514),
_MONSTER_ID_GENDERED(MAMOSWINE, 515),
_MONSTER_ID_GENDERED(PORYGON_Z, 516),
_MONSTER_ID_GENDERED(GALLADE, 517),
_MONSTER_ID_GENDERED(PROBOPASS, 518),
_MONSTER_ID_GENDERED(DUSKNOIR, 519),
_MONSTER_ID_GENDERED(FROSLASS, 520),
_MONSTER_ID_GENDERED(ROTOM, 521),
_MONSTER_ID_GENDERED(UXIE, 522),
_MONSTER_ID_GENDERED(MESPRIT, 523),
_MONSTER_ID_GENDERED(AZELF, 524),
_MONSTER_ID_GENDERED(DIALGA, 525),
_MONSTER_ID_GENDERED(PALKIA, 526),
_MONSTER_ID_GENDERED(HEATRAN, 527),
_MONSTER_ID_GENDERED(REGIGIGAS, 528),
_MONSTER_ID_GENDERED(GIRATINA_ALTERED, 529),
_MONSTER_ID_GENDERED(CRESSELIA, 530),
_MONSTER_ID_GENDERED(PHIONE, 531),
_MONSTER_ID_GENDERED(MANAPHY, 532),
_MONSTER_ID_GENDERED(DARKRAI, 533),
_MONSTER_ID_GENDERED(SHAYMIN_LAND, 534),
_MONSTER_ID_GENDERED(SHAYMIN_SKY, 535),
_MONSTER_ID_GENDERED(GIRATINA_ORIGIN, 536),
_MONSTER_ID_GENDERED(UNNAMED_0x219, 537),
_MONSTER_ID_GENDERED(UNNAMED_0x21A, 538),
_MONSTER_ID_GENDERED(UNNAMED_0x21B, 539),
_MONSTER_ID_GENDERED(UNNAMED_0x21C, 540),
_MONSTER_ID_GENDERED(UNNAMED_0x21D, 541),
_MONSTER_ID_GENDERED(UNNAMED_0x21E, 542),
_MONSTER_ID_GENDERED(UNNAMED_0x21F, 543),
_MONSTER_ID_GENDERED(UNNAMED_0x220, 544),
_MONSTER_ID_GENDERED(UNNAMED_0x221, 545),
_MONSTER_ID_GENDERED(UNNAMED_0x222, 546),
_MONSTER_ID_GENDERED(UNNAMED_0x223, 547),
_MONSTER_ID_GENDERED(UNNAMED_0x224, 548),
_MONSTER_ID_GENDERED(UNNAMED_0x225, 549),
_MONSTER_ID_GENDERED(UNNAMED_0x226, 550),
_MONSTER_ID_GENDERED(UNNAMED_0x227, 551),
_MONSTER_ID_GENDERED(PRIMAL_DIALGA, 552),
_MONSTER_ID_GENDERED(DECOY, 553),
_MONSTER_ID_GENDERED(STATUE, 554),
MONSTER_WIGGLYTUFF_STORY = 555,
MONSTER_REGIGIGAS_STORY = 556,
MONSTER_BRONZONG_STORY = 557,
MONSTER_HITMONLEE_STORY = 558,
MONSTER_CHIMECHO_STORY = 559,
MONSTER_WIGGLYTUFF_STORY_2 = 560,
MONSTER_UXIE_STORY = 561,
MONSTER_AZELF_STORY = 562,
MONSTER_MESPRIT_STORY = 563,
MONSTER_SUNFLORA_STORY = 564,
MONSTER_DIGLETT_STORY = 565,
MONSTER_DUGTRIO_STORY = 566,
MONSTER_CORPHISH_STORY = 567,
MONSTER_LOUDRED_STORY = 568,
MONSTER_BIDOOF_STORY = 569,
MONSTER_CHATOT_STORY = 570,
MONSTER_GROVYLE_STORY = 571,
MONSTER_DUSKNOIR_STORY = 572,
MONSTER_SABLEYE_STORY = 573,
MONSTER_DARKRAI_STORY = 574,
MONSTER_MAMA = 575,
MONSTER_GROVYLE_STORY_2 = 576,
MONSTER_DUSKNOIR_STORY_2 = 577,
MONSTER_DUSKNOIR_STORY_3 = 578,
MONSTER_SENTRET_DITTO = 579,
MONSTER_BELLOSSOM_DITTO = 580,
MONSTER_RESERVE_27 = 581,
MONSTER_RESERVE_28 = 582,
MONSTER_RESERVE_29 = 583,
MONSTER_RESERVE_30 = 584,
MONSTER_RESERVE_31 = 585,
MONSTER_RESERVE_32 = 586,
MONSTER_RESERVE_33 = 587,
MONSTER_RESERVE_34 = 588,
MONSTER_RESERVE_35 = 589,
MONSTER_RESERVE_36 = 590,
MONSTER_RESERVE_37 = 591,
MONSTER_RESERVE_38 = 592,
MONSTER_RESERVE_39 = 593,
MONSTER_RESERVE_40 = 594,
MONSTER_RESERVE_41 = 595,
MONSTER_RESERVE_42 = 596,
MONSTER_RESERVE_43 = 597,
MONSTER_RESERVE_44 = 598,
MONSTER_RESERVE_45 = 599,
};
#undef _MONSTER_ID_GENDERED
#endif //PMDSKY_MONSTER_ID_H

3
include/overlay_15_0238A140.h
View File

@ -1,7 +1,6 @@
#ifndef PMDSKY_OVERLAY_15_0238A140_H
#define PMDSKY_OVERLAY_15_0238A140_H
#include "monster_id.h"
#include "window.h"
// Represents arguments that might be passed to the PreprocessString function
@ -27,7 +26,7 @@ typedef struct {
s8 unk80;
s8 unk81;
u8 fill88[0x88 - 0x82];
enum monster_id unk88; //wrong probably
u32 unk88;
u8 fillAC[0xAC - 0x8C];
u32 unkAC;
u8 fillD4[0xD4 - 0xB0];

4
include/overlay_3102382820.h → include/overlay_31_02382820.h
View File

@ -79,13 +79,13 @@ struct struct_4 {
};
#define OV31_02382B54_CONST_1 (0x00000233)
u32 ov31_02382B54(void);
void ov31_02382DAC(void);
struct struct_1* ov31_02382E08(void);
void ov31_02382E18(struct entity* arg_1, u32 arg_2);
void ov31_02382ED4(struct entity* arg_1);
void ov31_02382F68(struct Window* window);
void StairsSubheadingCallback(struct Window* window);

2
include/window.h
View File

@ -1,7 +1,7 @@
#ifndef PMDSKY_WINDOW_H
#define PMDSKY_WINDOW_H
#include "monster_id.h"
#include "enums.h"
// Represents the state of a portrait to be displayed inside a window
typedef struct {

6
src/overlay_15_0238A140.c
View File

@ -14,21 +14,21 @@ extern void ov15_0238A4E8(u32);
u16 ov15_0238A140(void)
{
void* memPtr = MemAlloc(0xec,8);
void* memPtr = MemAlloc(0xEC, 8);
OVERLAY15_UNKNOWN_POINTER__NA_238B180 = memPtr;
InitPreprocessorArgs((preprocessor_args*)(&OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk88));
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk80 = CreateDialogueBox(0);
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk81 = CreatePortraitBox(0,3,1);
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk81 = CreatePortraitBox(0, 3, 1);
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk68 = 0xFE;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk10 = 0;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk88 = MONSTER_DUSKULL;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unkAC = 0x270F;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unkD4 = 0x183;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unkD4 = MONSTER_DUSKULL;
OVERLAY15_UNKNOWN_POINTER__NA_238B180->unk0 = 0;
InitPortraitParamsWithMonsterId(&OVERLAY15_UNKNOWN_POINTER__NA_238B180->unkDC, MONSTER_DUSKULL);

42
src/overlay_3102382820.c → src/overlay_31_02382820.c
View File

@ -1,4 +1,4 @@
#include "overlay_3102382820.h"
#include "overlay_31_02382820.h"
extern struct dungeon* DUNGEON_PTR;
@ -61,7 +61,7 @@ extern u32 ov29_022F0B9C(void);
extern void ov29_022E0C2C(u32);
extern u32 GetFloorType(void);
extern u32 ov29_02338708(struct position*);
extern u32 PositionIsOnHiddenStairs(struct position*);
void EntryOverlay31(void) {
struct struct_1* r0;
@ -86,28 +86,28 @@ void DrawDungeonMenuStatusWindow(struct Window* window)
s32 line_offset;
u8 is_valid_member;
s32 i;
leader = GetLeader();
leader_info = (struct monster*)leader->info;
//str_values.dungeon_0 = leader_info->roost;
str_values.digits_0 = CeilFixedPoint(leader_info->belly);
str_values.digits_1 = CeilFixedPoint(leader_info->max_belly);
str = StringFromId(DRAW_DUNGEON_MENU_STATUS_WINDOW_STR_ID_1);
PreprocessString(str_buff, DRAW_DUNGEON_MENU_STATUS_WINDOW_BUFF_SIZE, str, 0, &str_values);
DrawTextInWindow(window, X_OFFSET, 0, str_buff);
str_values.gold_left_0 = GetMoneyCarried();
str = StringFromId(DRAW_DUNGEON_MENU_STATUS_WINDOW_STR_ID_2);
PreprocessString(str_buff, DRAW_DUNGEON_MENU_STATUS_WINDOW_BUFF_SIZE, str, 0, &str_values);
DrawTextInWindow(window, X_OFFSET, LINE_HEIGHT, str_buff);
str_values.weather_0 = GetApparentWeather(0);
str = StringFromId(DRAW_DUNGEON_MENU_STATUS_WINDOW_STR_ID_3);
PreprocessString(str_buff, DRAW_DUNGEON_MENU_STATUS_WINDOW_BUFF_SIZE, str, 0, &str_values);
DrawTextInWindow(window, X_OFFSET, LINE_HEIGHT * 2, str_buff);
str_values.time_0 = sub_0204F9E0();
str = StringFromId(DRAW_DUNGEON_MENU_STATUS_WINDOW_STR_ID_4);
PreprocessString(str_buff, DRAW_DUNGEON_MENU_STATUS_WINDOW_BUFF_SIZE, str, DRAW_DUNGEON_MENU_STATUS_WINDOW_CONST_1, &str_values);
@ -130,18 +130,18 @@ void DrawDungeonMenuStatusWindow(struct Window* window)
str_values.value_1 = MIN(member_info->max_hp_stat + member_info->max_hp_boost,
DRAW_DUNGEON_MENU_STATUS_WINDOW_CONST_2);
str = StringFromId(DRAW_DUNGEON_MENU_STATUS_WINDOW_STR_ID_5);
PreprocessString(str_buff, DRAW_DUNGEON_MENU_STATUS_WINDOW_BUFF_SIZE, str, 0, &str_values);
DrawTextInWindow(window, 4, line_offset, str_buff);
line_offset += 12;
if (line_offset >= 0x30) {
break;
}
}
}
UpdateWindow(window);
}
@ -164,12 +164,12 @@ u32 ov31_02382B54(void)
u16 pressed_buttons;
struct struct_2 sp;
struct entity* leader;
switch (OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->a) {
case 0:
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->a++;
break;
case 1:
for (int i = 0; i<7; i++) {
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->b[i] = 0;
@ -190,7 +190,7 @@ u32 ov31_02382B54(void)
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->f[1] = CreateTextBox(&DUNGEON_WINDOW_PARAMS_2, DungeonMenuSwitch);
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->a++;
break;
case 2:
if (IsParentMenuActive(OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->f[0])) {
u8 tmp4 = sub_0202AB80(OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->f[0]);
@ -200,7 +200,7 @@ u32 ov31_02382B54(void)
GetPressedButtons(0, &pressed_buttons);
if ((pressed_buttons & 0x400) == 0)
break;
struct entity* leader = GetLeader();
if (ShouldMonsterRunAwayVariation(leader, 1))
@ -222,7 +222,7 @@ u32 ov31_02382B54(void)
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->a++;
}
break;
case 3:
OVERLAY31_UNKNOWN_POINTER__NA_238A260[1] = sub_0202ABB0(OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->f[0]);
OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]->a++;
@ -259,7 +259,7 @@ void ov31_02382E18(struct entity* arg_1, u32 arg_2)
while ((u8)(ov31_0238A2A0.st3 != NULL)) {
AdvanceFrame(0x62);
}
AdvanceFrame(0x62);
if (ov29_022F0B9C()) {
@ -282,8 +282,8 @@ void ov31_02382ED4(struct entity* arg_1)
ov31_0238A2A0.st3 = tmp1;
ov31_0238A2A0.st3->f = 0;
ov31_0238A2A0.st3->a = arg_1;
ov31_0238A2A0.st3->b = 0;
ov31_0238A2A0.st3->c = 0;
ov31_0238A2A0.st3->b = 0;
ov31_0238A2A0.st3->c = 0;
u32 floor_type = GetFloorType();
u32 r4 = 0;
@ -291,14 +291,14 @@ void ov31_02382ED4(struct entity* arg_1)
r4 = 2;
} else if (floor_type == 1) {
r4 = 1;
} else if (ov29_02338708(&(arg_1->pos))) {
} else if (PositionIsOnHiddenStairs(&(arg_1->pos))) {
r4 = 3;
}
ov31_0238A2A0.st3->d = r4;
}
void ov31_02382F68(struct Window* window)
void StairsSubheadingCallback(struct Window* window)
{
u8* str = StringFromId(ov31_02389E22[ov31_0238A2A0.st3->d * 2]);

2
tools/m2ctx/m2ctx.sh
View File

@ -4,7 +4,7 @@ OUT_FILE=ctx.c
GCC=gcc
FLAGS="-E -P -dD -undef"
INCLUDES="-Iinclude -Iinclude/library -Ifiles -Ilib/include" # -include global.h"
INCLUDES="-Iinclude -Iinclude/library -Ifiles -Ilib/include -include global.h"
DEFINES="-DGAME_REMASTER=0 -DNORTH_AMERICA -DPM_KEEP_ASSERTS -DSDK_ARM9 -DSDK_CODE_ARM -DSDK_FINALROM"