diff options
Diffstat (limited to 'engine')
30 files changed, 1467 insertions, 1467 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 031e42c..77a4d6b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,7 +1,7 @@ include "constants.asm" SECTION "engine/battle/core.asm", ROMX -_BattleRandom: ; 3e3da (f:63da) +_BattleRandom: ; If the normal RNG is used in a link battle it'll desync. ; To circumvent this a shared PRNG is used instead. diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 4a0283b..0ffe425 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -12,7 +12,7 @@ SECTION "engine/battle_anims/bg_effects.asm", ROMX ; BG effects for use in battle animations. -ExecuteBGEffects: ; c8000 (32:4000) +ExecuteBGEffects: ld hl, wActiveBGEffects ld e, 5 .loop @@ -33,7 +33,7 @@ ExecuteBGEffects: ; c8000 (32:4000) jr nz, .loop ret -QueueBGEffect: ; c801a (32:401a) +QueueBGEffect: ld hl, wActiveBGEffects ld e, 5 .loop @@ -62,13 +62,13 @@ QueueBGEffect: ; c801a (32:401a) ld [hl], a ret -EndBattleBGEffect: ; c8043 (32:4043) +EndBattleBGEffect: ld hl, BG_EFFECT_STRUCT_FUNCTION add hl, bc ld [hl], 0 ret -DoBattleBGEffectFunction: ; c804a (32:404a) +DoBattleBGEffectFunction: ld hl, BG_EFFECT_STRUCT_FUNCTION add hl, bc ld e, [hl] @@ -81,7 +81,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a) ld l, a jp hl -BattleBGEffects: ; c805a (32:405a) +BattleBGEffects: ; entries correspond to ANIM_BG_* constants dw BattleBGEffect_End dw BattleBGEffect_FlashInverted @@ -138,17 +138,17 @@ BattleBGEffects: ; c805a (32:405a) ;dw BattleBGEffect_WobbleMon -BattleBGEffect_End: ; c80b6 (32:40b6) +BattleBGEffect_End: call EndBattleBGEffect ret -BattleBGEffects_AnonJumptable: ; c80ba (32:40ba) +BattleBGEffects_AnonJumptable: ld hl, sp+$0 ld e, [hl] inc hl ld d, [hl] inc de -BatttleBGEffects_GetNamedJumptablePointer: ; c80c0 (32:40c0) +BatttleBGEffects_GetNamedJumptablePointer: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc ld l, [hl] @@ -160,33 +160,33 @@ BatttleBGEffects_GetNamedJumptablePointer: ; c80c0 (32:40c0) ld l, a ret -BattleBGEffects_IncrementJumptable: ; c80cd (32:40cd) +BattleBGEffects_IncrementJumptable: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc inc [hl] ret -BattleBGEffect_FlashInverted: ; c80d3 (32:40d3) +BattleBGEffect_FlashInverted: ld de, .inverted call BattleBGEffect_FlashContinue ret .inverted - db %11100100 ; 3210 - db %00011011 ; 0123 + db %11100100 + db %00011011 ; c80f3 -BattleBGEffect_FlashWhite: ; c80dc (32:40dc) +BattleBGEffect_FlashWhite: ld de, .white call BattleBGEffect_FlashContinue ret .white - db %11100100 ; 3210 - db %00000000 ; 0000 + db %11100100 + db %00000000 ; c80fb -BattleBGEffect_FlashContinue: ; c80e5 (32:40e5) +BattleBGEffect_FlashContinue: ; current timer, flash duration, number of flashes ld a, $1 ld [wBattleAnimTemp0], a @@ -224,7 +224,7 @@ BattleBGEffect_FlashContinue: ; c80e5 (32:40e5) ld [wBGP], a ret -BattleBGEffect_WhiteHues: ; c8117 (32:4117) +BattleBGEffect_WhiteHues: ld de, .Pals call BattleBGEffect_GetNthDMGPal jr c, .quit @@ -242,7 +242,7 @@ BattleBGEffect_WhiteHues: ; c8117 (32:4117) db -1 ; c8141 -BattleBGEffect_BlackHues: ; c812b (32:412b) +BattleBGEffect_BlackHues: ld de, .Pals call BattleBGEffect_GetNthDMGPal jr c, .quit @@ -260,7 +260,7 @@ BattleBGEffect_BlackHues: ; c812b (32:412b) db -1 ; c8155 -BattleBGEffect_AlternateHues: ; c813f (32:413f) +BattleBGEffect_AlternateHues: ld de, .Pals call BattleBGEffect_GetNthDMGPal jr c, .quit @@ -284,7 +284,7 @@ BattleBGEffect_AlternateHues: ; c813f (32:413f) db -2 ; c8171 -BattleBGEffect_06: ; c815b (32:415b) +BattleBGEffect_06: call BattleBGEffects_CheckSGB jr nz, .sgb ld de, .PalsCGB @@ -308,7 +308,7 @@ BattleBGEffect_06: ; c815b (32:415b) db -2 ; c818b -BattleBGEffect_07: ; c8175 (32:4175) +BattleBGEffect_07: call BattleBGEffects_CheckSGB jr nz, .sgb ld de, .PalsCGB @@ -332,7 +332,7 @@ BattleBGEffect_07: ; c8175 (32:4175) db -2 ; c81a5 -BattleBGEffect_08: ; c818f (32:418f) +BattleBGEffect_08: ld de, .Pals call BattleBGEffect_GetNthDMGPal ld [wBGP], a @@ -345,7 +345,7 @@ BattleBGEffect_08: ; c818f (32:418f) db -2 ; c81b3 -BattleBGEffect_HideMon: ; c819d (32:419d) +BattleBGEffect_HideMon: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -381,7 +381,7 @@ BattleBGEffect_HideMon: ; c819d (32:419d) call EndBattleBGEffect ret -BattleBGEffect_ShowMon: ; c81d2 (32:41d2) +BattleBGEffect_ShowMon: call BGEffect_CheckFlyDigStatus jr z, .not_flying call EndBattleBGEffect @@ -411,7 +411,7 @@ BattleBGEffect_ShowMon: ; c81d2 (32:41d2) db -1 ; c8214 -BattleBGEffect_FeetFollow: ; c81fc (32:41fc) +BattleBGEffect_FeetFollow: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -478,7 +478,7 @@ BattleBGEffect_FeetFollow: ; c81fc (32:41fc) call EndBattleBGEffect ret -BattleBGEffect_HeadFollow: ; c8266 (32:4266) +BattleBGEffect_HeadFollow: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -545,11 +545,11 @@ BattleBGEffect_HeadFollow: ; c8266 (32:4266) call EndBattleBGEffect ret -_QueueBattleAnimation: ; c82ee (32:42ee) +_QueueBattleAnimation: callab QueueBattleAnimation ret -BattleBGEffect_27: ; c82d9 (32:42d9) +BattleBGEffect_27: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -638,7 +638,7 @@ BattleBGEffect_27: ; c82d9 (32:42d9) call EndBattleBGEffect ret -BattleBGEffect_EnterMon: ; c8350 (32:4350) +BattleBGEffect_EnterMon: call BGEffect_CheckBattleTurn jr nz, .player_turn ld de, .EnemyData @@ -666,7 +666,7 @@ BattleBGEffect_EnterMon: ; c8350 (32:4350) db -1 ; c83a8 -BattleBGEffect_ReturnMon: ; c837d (32:437d) +BattleBGEffect_ReturnMon: call BGEffect_CheckBattleTurn jr nz, .player_turn ld de, .EnemyData @@ -702,7 +702,7 @@ BattleBGEffect_ReturnMon: ; c837d (32:437d) db -1 ; c83ed -BattleBGEffect_RunPicResizeScript: ; c83c2 (32:43c2) +BattleBGEffect_RunPicResizeScript: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -905,7 +905,7 @@ ENDM db $06, $1b, $30 ; c8545 -BattleBGEffect_Surf: ; c851d (32:451d) +BattleBGEffect_Surf: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -962,7 +962,7 @@ BattleBGEffect_Surf: ; c851d (32:451d) ld [bc], a ret -BattleBGEffect_Psychic: ; c8560 (32:4560) +BattleBGEffect_Psychic: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1001,7 +1001,7 @@ BattleBGEffect_Psychic: ; c8560 (32:4560) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_Teleport: ; c8599 (32:4599) +BattleBGEffect_Teleport: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1027,7 +1027,7 @@ BattleBGEffect_Teleport: ; c8599 (32:4599) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_NightShade: ; c85bd (32:45bd) +BattleBGEffect_NightShade: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1056,7 +1056,7 @@ BattleBGEffect_NightShade: ; c85bd (32:45bd) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_DoubleTeam: ; c85e5 (32:45e5) +BattleBGEffect_DoubleTeam: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1146,7 +1146,7 @@ BattleBGEffect_DoubleTeam: ; c85e5 (32:45e5) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_AcidArmor: ; c865e (32:465e) +BattleBGEffect_AcidArmor: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1188,7 +1188,7 @@ BattleBGEffect_AcidArmor: ; c865e (32:465e) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_Withdraw: ; c8695 (32:4695) +BattleBGEffect_Withdraw: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1238,7 +1238,7 @@ BattleBGEffect_Withdraw: ; c8695 (32:4695) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_Dig: ; c86dc (32:46dc) +BattleBGEffect_Dig: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1306,7 +1306,7 @@ BattleBGEffect_Dig: ; c86dc (32:46dc) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_Tackle: ; c873b (32:473b) +BattleBGEffect_Tackle: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1383,7 +1383,7 @@ Tackle_BGEffect25_2d_two: ld [hl], a ret -Functionc88a5: ; c87aa (32:47aa) +Functionc88a5: push af .asm_c87ab: ld a, [rLY] @@ -1393,7 +1393,7 @@ Functionc88a5: ; c87aa (32:47aa) call BGEffect_FillLYOverridesBackup ret -BattleBGEffect_2d: ; c87b6 (32:47b6) +BattleBGEffect_2d: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1429,7 +1429,7 @@ BGEffect2d_2f_zero: ld [hl], a ret -BattleBGEffect_2f: ; c87e9 (32:47e9) +BattleBGEffect_2f: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1444,7 +1444,7 @@ BattleBGEffect_2f: ; c87e9 (32:47e9) .two ret -BattleBGEffect_26: ; c87fb (32:47fb) +BattleBGEffect_26: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1494,7 +1494,7 @@ BattleBGEffect_26: ; c87fb (32:47fb) call BGEffect_FillLYOverridesBackup ret -BattleBGEffect_2c: ; c8842 (32:4842) +BattleBGEffect_2c: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1560,7 +1560,7 @@ BattleBGEffect_2c: ; c8842 (32:4842) call BGEffect_FillLYOverridesBackup ret -BattleBGEffect_28: ; c88a0 (32:48a0) +BattleBGEffect_28: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1604,7 +1604,7 @@ BattleBGEffect_28: ; c88a0 (32:48a0) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_BounceDown: ; c88da (32:48da) +BattleBGEffect_BounceDown: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1656,7 +1656,7 @@ BattleBGEffect_BounceDown: ; c88da (32:48da) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_2a: ; c8927 (32:4927) +BattleBGEffect_2a: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1766,7 +1766,7 @@ BattleBGEffect_2a: ; c8927 (32:4927) db -1 ; c8acc -BattleBGEffect_2b: ; c89ba (32:49ba) +BattleBGEffect_2b: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1804,7 +1804,7 @@ BattleBGEffect_2b: ; c89ba (32:49ba) call BattleAnim_ResetLCDStatCustom ret -BattleBGEffect_1c: ; c89ef (32:49ef) +BattleBGEffect_1c: call BattleBGEffects_AnonJumptable jp hl .anon_dw @@ -1894,7 +1894,7 @@ BattleBGEffect_1c: ; c89ef (32:49ef) db $90, $f8 ; c8be8 -BattleBGEffect_RapidFlash: ; c8a6e (32:4a6e) +BattleBGEffect_RapidFlash: ld de, .FlashPals call BGEffect_RapidCyclePals ret @@ -1903,7 +1903,7 @@ BattleBGEffect_RapidFlash: ; c8a6e (32:4a6e) db $e4, $6c, $fe ; c8bf2 -BattleBGEffect_16: ; c8a78 (32:4a78) +BattleBGEffect_16: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1912,7 +1912,7 @@ BattleBGEffect_16: ; c8a78 (32:4a78) db $e4, $90, $40, $ff ; c8bfd -BattleBGEffect_17: ; c8a83 (32:4a83) +BattleBGEffect_17: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1921,7 +1921,7 @@ BattleBGEffect_17: ; c8a83 (32:4a83) db $e4, $f8, $fc, $ff ; c8c08 -BattleBGEffect_18: ; c8a8e (32:4a8e) +BattleBGEffect_18: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1930,7 +1930,7 @@ BattleBGEffect_18: ; c8a8e (32:4a8e) db $e4, $90, $40, $90, $fe ; c8c14 -BattleBGEffect_19: ; c8a9a (32:4a9a) +BattleBGEffect_19: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1939,7 +1939,7 @@ BattleBGEffect_19: ; c8a9a (32:4a9a) db $e4, $f8, $fc, $f8, $fe ; c8c20 -BattleBGEffect_1a: ; c8aa6 (32:4aa6) +BattleBGEffect_1a: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1948,7 +1948,7 @@ BattleBGEffect_1a: ; c8aa6 (32:4aa6) db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe ; c8c30 -BattleBGEffect_1b: ; c8ab6 (32:4ab6) +BattleBGEffect_1b: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1957,7 +1957,7 @@ BattleBGEffect_1b: ; c8ab6 (32:4ab6) db $e4, $fc, $e4, $00, $fe ; c8c3c -BattleBGEffect_1d: ; c8ac2 (32:4ac2) +BattleBGEffect_1d: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1966,7 +1966,7 @@ BattleBGEffect_1d: ; c8ac2 (32:4ac2) db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff ; c8c55 -BattleBGEffect_1e: ; c8adb (32:4adb) +BattleBGEffect_1e: ld de, .Pals call BGEffect_RapidCyclePals ret @@ -1975,7 +1975,7 @@ BattleBGEffect_1e: ; c8adb (32:4adb) db $00, $40, $90, $e4, $ff ; c8c61 -BattleBGEffect_2e: ; c8ae7 (32:4ae7) +BattleBGEffect_2e: call Functionc8d0b jr c, .xor_a bit 7, a @@ -1989,7 +1989,7 @@ BattleBGEffect_2e: ; c8ae7 (32:4ae7) ld [$c753], a ; wAnimObject01YOffset ret -BattleBGEffect_1f: ; c8afa (32:4afa) +BattleBGEffect_1f: call Functionc8d0b jr nc, .skip xor a @@ -1997,7 +1997,7 @@ BattleBGEffect_1f: ; c8afa (32:4afa) ldh [hSCX], a ret -BattleBGEffect_20: ; c8b03 (32:4b03) +BattleBGEffect_20: call Functionc8d0b jr nc, .skip xor a @@ -2005,7 +2005,7 @@ BattleBGEffect_20: ; c8b03 (32:4b03) ldh [hSCY], a ret -Functionc8d0b: ; c8b0c (32:4b0c) +Functionc8d0b: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc ld a, [hl] @@ -2043,7 +2043,7 @@ Functionc8d0b: ; c8b0c (32:4b0c) and a ret -BattleBGEffect_GetNthDMGPal: ; c8b3b (32:4b3b) +BattleBGEffect_GetNthDMGPal: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc ld a, [hl] @@ -2066,7 +2066,7 @@ BattleBGEffect_GetNthDMGPal: ; c8b3b (32:4b3b) call BattleBGEffect_GetFirstDMGPal ret -BGEffect_RapidCyclePals: ; c8b5b (32:4b5b) +BGEffect_RapidCyclePals: push de ld de, .Jumptable_DMG call BatttleBGEffects_GetNamedJumptablePointer @@ -2079,7 +2079,7 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b) dw .two_dmg -.zero_dmg ; c8d8b (32:4d8b) +.zero_dmg call BattleBGEffects_IncrementJumptable ld a, $e4 call BattleBGEffects_SetLYOverrides @@ -2097,7 +2097,7 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b) ld [hl], a ret -.one_dmg ; c8daa (32:4daa) +.one_dmg ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2122,19 +2122,19 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b) dec [hl] ret -.two_dmg ; c8dc9 (32:4dc9) +.two_dmg call BattleBGEffects_ResetVideoHRAM ld a, %11100100 ld [rBGP], a call EndBattleBGEffect ret -BattleBGEffect_GetFirstDMGPal: ; c8bb3 (32:4bb3) +BattleBGEffect_GetFirstDMGPal: ld hl, BG_EFFECT_STRUCT_03 add hl, bc ld a, [hl] inc [hl] -BattleBGEffect_GetNextDMGPal: ; c8bb9 (32:4bb9) +BattleBGEffect_GetNextDMGPal: ld l, a ld h, $0 add hl, de @@ -2155,9 +2155,9 @@ BattleBGEffect_GetNextDMGPal: ; c8bb9 (32:4bb9) scf ret -BattleBGEffects_ClearLYOverrides: ; c8bd1 (32:4bd1) +BattleBGEffects_ClearLYOverrides: xor a -BattleBGEffects_SetLYOverrides: ; c8bd2 (32:4bd2) +BattleBGEffects_SetLYOverrides: ld hl, wLYOverrides ld e, $91 .loop @@ -2166,7 +2166,7 @@ BattleBGEffects_SetLYOverrides: ; c8bd2 (32:4bd2) jr nz, .loop ret -BattleBGEffect_SetLCDStatCustoms: ; c8bdc (32:4bdc) +BattleBGEffect_SetLCDStatCustoms: ldh [hLCDCPointer], a call BGEffect_CheckBattleTurn jr nz, .player_turn @@ -2182,7 +2182,7 @@ BattleBGEffect_SetLCDStatCustoms: ; c8bdc (32:4bdc) ldh [hLYOverrideEnd], a ret -BattleAnim_ResetLCDStatCustom: ; c8bf2 (32:4bf2) +BattleAnim_ResetLCDStatCustom: xor a ldh [hLYOverrideStart], a ldh [hLYOverrideEnd], a @@ -2192,7 +2192,7 @@ BattleAnim_ResetLCDStatCustom: ; c8bf2 (32:4bf2) call EndBattleBGEffect ret -BattleBGEffects_ResetVideoHRAM: ; c8c01 (32:4c01) +BattleBGEffects_ResetVideoHRAM: xor a ldh [hLCDCPointer], a ldh [hLYOverrideStart], a @@ -2200,7 +2200,7 @@ BattleBGEffects_ResetVideoHRAM: ; c8c01 (32:4c01) call BattleBGEffects_ClearLYOverrides ret -Functionc8f2e: ; c8c0c (32:4c0c) +Functionc8f2e: push bc xor a ld [wBattleAnimTemp0], a @@ -2235,7 +2235,7 @@ Functionc8f2e: ; c8c0c (32:4c0c) pop bc ret -InitSurfWaves: ; c8c47 (32:4c47) +InitSurfWaves: push bc xor a ld [wBattleAnimTemp0], a @@ -2263,7 +2263,7 @@ InitSurfWaves: ; c8c47 (32:4c47) pop bc ret -BattleBGEffect_WavyScreenFX: ; c8c78 (32:4c78) +BattleBGEffect_WavyScreenFX: push bc ldh a, [hLYOverrideStart] ld l, a @@ -2290,7 +2290,7 @@ BattleBGEffect_WavyScreenFX: ; c8c78 (32:4c78) pop bc ret -BGEffect_FillLYOverridesBackup: ; c8c94 (32:4c94) +BGEffect_FillLYOverridesBackup: push af ld h, HIGH(wLYOverrides) ldh a, [hLYOverrideStart] @@ -2305,7 +2305,7 @@ BGEffect_FillLYOverridesBackup: ; c8c94 (32:4c94) jr nz, .loop ret -BGEffect_DisplaceLYOverridesBackup: ; c8ca4 (32:4ca4) +BGEffect_DisplaceLYOverridesBackup: ; e = a; d = [hLYOverrideEnd] - [hLYOverrideStart] - a push af ld e, a @@ -2332,7 +2332,7 @@ BGEffect_DisplaceLYOverridesBackup: ; c8ca4 (32:4ca4) jr nz, .loop2 ret -BGEffect_CheckBattleTurn: ; c8cc2 (32:4cc2) +BGEffect_CheckBattleTurn: ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ldh a, [hBattleTurn] @@ -2340,7 +2340,7 @@ BGEffect_CheckBattleTurn: ; c8cc2 (32:4cc2) xor [hl] ret -BGEffect_CheckFlyDigStatus: ; c8ccc (32:4ccc) +BGEffect_CheckFlyDigStatus: ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ldh a, [hBattleTurn] @@ -2356,18 +2356,18 @@ BGEffect_CheckFlyDigStatus: ; c8ccc (32:4ccc) bit 6, a ret -BattleBGEffects_CheckSGB: ; c8ce3 (32:4ce3) +BattleBGEffects_CheckSGB: ld a, [wSGB] and a ret -BattleBGEffects_Sine: ; c8ce8 (32:4ce8) +BattleBGEffects_Sine: ld e, a callab BattleAnim_Sine_e ld a, e ret -BattleBGEffects_Cosine: ; c8cf3 (32:4cf3) +BattleBGEffects_Cosine: ld e, a callab BattleAnim_Cosine_e ld a, e diff --git a/engine/bcd.asm b/engine/bcd.asm index 7b7c1b8..6b561df 100755 --- a/engine/bcd.asm +++ b/engine/bcd.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/bcd.asm", ROMX -AddBCD: ; 03:4de3 +AddBCD: and a ld b, c .add @@ -29,7 +29,7 @@ AddBCD: ; 03:4de3 ret -SubBCD: ; 03:4df9 +SubBCD: and a ld b, c .sub diff --git a/engine/dumps/bank01.asm b/engine/dumps/bank01.asm index 3495b00..36a2f6c 100755 --- a/engine/dumps/bank01.asm +++ b/engine/dumps/bank01.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank01.asm@Function40fd", ROMX -Function40fd: ; 01:40fd +Function40fd: ld hl, wd41a set 5, [hl] ld hl, wd41a @@ -107,35 +107,35 @@ Table416b: dw Unknown41eb dw Unknown4203 -Unknown41eb: ; 01:41eb +Unknown41eb: db $00, $01, $02, $03 -Unknown41ef: ; 01:41ef +Unknown41ef: db $80, $81, $82, $83 -Unknown41f3: ; 01:41f3 +Unknown41f3: db $04, $05, $06, $07 -Unknown41f7: ; 01:41f7 +Unknown41f7: db $84, $85, $86, $87 -Unknown41fb: ; 01:41fb +Unknown41fb: db $08, $09, $0a, $0b -Unknown41ff: ; 01:41ff +Unknown41ff: db $88, $89, $8a, $8b -Unknown4203: ; 01:4203 +Unknown4203: db $00, $00, $00, $00 db $08, $00, $08, $00 db $02, $08, $08, $03 -Unknown420f: ; 01:420f +Unknown420f: db $00, $08, $20, $00 db $00, $20, $08, $08 db $22, $08, $00, $23 -Table421b: ; 01:421b +Table421b: dw Unknown423b dw Unknown424b dw Unknown423b @@ -153,67 +153,67 @@ Table421b: ; 01:421b dw Unknown42ab dw Unknown42cb -Unknown423b: ; 01:423b +Unknown423b: db $00, $00, $00, $00 db $00, $08, $01, $00 db $08, $00, $02, $02 db $08, $08, $03, $03 -Unknown424b: ; 01:424b +Unknown424b: db $00, $00, $80, $00 db $00, $08, $81, $00 db $08, $00, $82, $02 db $08, $08, $83, $03 -Unknown425b: ; 01:425b +Unknown425b: db $00, $08, $80, $20 db $00, $00, $81, $20 db $08, $08, $82, $22 db $08, $00, $83, $23 -Unknown426b: ; 01:426b +Unknown426b: db $00, $00, $04, $00 db $00, $08, $05, $00 db $08, $00, $06, $02 db $08, $08, $07, $03 -Unknown427b: ; 01:427b +Unknown427b: db $00, $00, $84, $00 db $00, $08, $85, $00 db $08, $00, $86, $02 db $08, $08, $87, $03 -Unknown428b: ; 01:428b +Unknown428b: db $00, $08, $84, $20 db $00, $00, $85, $20 db $08, $08, $86, $22 db $08, $00, $87, $23 -Unknown429b: ; 01:429b +Unknown429b: db $00, $00, $08, $00 db $00, $08, $09, $00 db $08, $00, $0a, $02 db $08, $08, $0b, $03 -Unknown42ab: ; 01:42ab +Unknown42ab: db $00, $08, $08, $20 db $00, $00, $09, $20 db $08, $08, $0a, $22 db $08, $00, $0b, $23 -Unknown42bb: ; 01:42bb +Unknown42bb: db $00, $00, $88, $00 db $00, $08, $89, $00 db $08, $00, $8a, $02 db $08, $08, $8b, $03 -Unknown42cb: ; 01:42cb +Unknown42cb: db $00, $08, $88, $20 db $00, $00, $89, $20 db $08, $08, $8a, $22 db $08, $00, $8b, $23 -Function42db: ; 01:42db +Function42db: ld bc, wCmdQueue ld a, $01 .sub_42e0 @@ -272,13 +272,13 @@ Table4329:: dw Function446c dw Function4495 -Function4333: ; 01:4333 +Function4333: ret -Function4334: ; 01:4334 +Function4334: ret -Function4335: ; 01:4335 +Function4335: push bc ld h, b ld l, c @@ -288,13 +288,13 @@ Function4335: ; 01:4335 pop bc ret -Function4341: ; 01:4341 +Function4341: ld hl, $000a add hl, bc inc [hl] ret -Function4347: ; 01:4347 +Function4347: pop hl ld e, [hl] inc hl @@ -310,7 +310,7 @@ Function4347: ; 01:4347 ld l, a jp hl -Function4358: ; 01:4358 +Function4358: ld hl, $000a add hl, bc ld a, [hl] @@ -323,7 +323,7 @@ Function4358: ; 01:4358 ld l, a jp hl -Function4366: ; 01:4366 +Function4366: push bc ld hl, $0000 add hl, bc @@ -335,15 +335,15 @@ Function4366: ; 01:4366 pop bc ret -Function4374: ; 01:4374 +Function4374: ld de, Table437a jp Function4358 -Table437a: ; 01:437a +Table437a: dw Function437e dw Function439b -Function437e: ; 01:437e +Function437e: call Function4341 ld hl, $000e add hl, bc @@ -361,18 +361,18 @@ Function437e: ; 01:437e add hl, bc ld [hl], a -Function439b: ; 01:439b +Function439b: jp Function4402 -Function439e: ; 01:439e +Function439e: ld de, Table43a4 jp Function4358 -Table43a4: ; 01:43a4 +Table43a4: dw Function43a8 dw Function43c6 -Function43a8: ; 01:43a8 +Function43a8: call Function4341 call Function4366 ld hl, $0009 @@ -390,18 +390,18 @@ Function43a8: ; 01:43a8 add hl, bc ld [hl], $08 -Function43c6: ; 01:43c6 +Function43c6: jp Function4402 -Function43c9: ; 01:43c9 +Function43c9: ld de, Table43cf jp Function4358 -Table43cf: ; 01:43cf +Table43cf: dw Function43d3 dw Function43ff -Function43d3: ; 01:43d3 +Function43d3: call Function4366 ld hl, $0009 add hl, de @@ -428,10 +428,10 @@ Function43d3: ; 01:43d3 ld [hl], a ldh [rOBP1], a -Function43ff: ; 01:43ff +Function43ff: jp Function4402 -Function4402: ; 01:4402 +Function4402: ld hl, $000b add hl, bc ld a, [hl] @@ -461,15 +461,15 @@ Function4402: ; 01:4402 ld [hl], a ret -Function4430: ; 01:4430 +Function4430: ld hl, Table4436 jp Function4358 -Table4436: ; 01:4436 +Table4436: dw Function443a dw Function444f -Function443a: ; 01:443a +Function443a: call Function4341 ld hl, $000b add hl, bc @@ -481,16 +481,16 @@ Function443a: ; 01:443a add hl, bc ld [hl], $f0 -Function444f: ; 01:444f +Function444f: jp Function4402 -Function4452: ; 01:4452 +Function4452: ld hl, $000c add hl, bc ld [hl], $02 ret -Function4459: ; 01:4459 +Function4459: ld hl, $000b add hl, bc ld a, [hl] @@ -504,7 +504,7 @@ Function4459: ; 01:4459 ld [hl], a ret -Function446c: ; 01:446c +Function446c: ld hl, $0009 add hl, bc inc [hl] @@ -533,7 +533,7 @@ Function446c: ; 01:446c ld [hl], a ret -Function4495: ; 01:4495 +Function4495: ld hl, $0009 add hl, bc inc [hl] @@ -550,39 +550,39 @@ Function4495: ; 01:4495 ld [hl], a ret -Table44ab: ; 01:44ab +Table44ab: dw Unknown44b5 dw Unknown44b6 dw Unknown44c7 dw Unknown44d0 dw Unknown44e1 -Unknown44b5: ; 01:44b5 +Unknown44b5: db $00 -Unknown44b6: ; 01:44b6 +Unknown44b6: db $04, $00, $00, $00 db $00, $00, $08, $01 db $00, $08, $00, $02 db $00, $08, $08, $03, $00 -Unknown44c7: ; 01:44c7 +Unknown44c7: db $02, $00, $00, $00 db $00, $00, $08, $00, $20 -Unknown44d0: ; 01:44d0 +Unknown44d0: db $04, $00, $00, $00 db $00, $00, $08, $00 db $00, $08, $00, $00 db $00, $08, $08, $00, $00 -Unknown44e1: ; 01:44e1 +Unknown44e1: db $04, $00, $00, $00 db $40, $00, $08, $00 db $40, $08, $00, $00 db $40, $08, $08, $00, $40 -Function44f2: ; 01:44f2 +Function44f2: ld hl, $0008 add hl, bc ld a, [hl] @@ -628,13 +628,13 @@ Table4516:: dw Function4a8b dw Function4869 -Function453e: ; 01:453e +Function453e: ld hl, $000a add hl, bc ld [hl], $02 ret -Function4545: ; 01:4545 +Function4545: ld hl, $0005 add hl, bc bit 6, [hl] @@ -645,19 +645,19 @@ Function4545: ; 01:4545 ld hl, Table4558 jp CallJumptable -Table4558: ; 01:4558 +Table4558: dw Function4560 dw Function4567 dw Function4593 dw Function45a0 -Function4560: ; 01:4560 +Function4560: ld hl, $000d add hl, bc ld [hl], $ff ret -Function4567: ; 01:4567 +Function4567: ld hl, $0004 add hl, bc bit 3, [hl] @@ -686,7 +686,7 @@ Function4567: ; 01:4567 ld [hl], a ret -Function4593: ; 01:4593 +Function4593: ld hl, $0007 add hl, bc ld a, [hl] @@ -696,7 +696,7 @@ Function4593: ; 01:4593 ld [hl], a ret -Function45a0: ; 01:45a0 +Function45a0: ld hl, $000b add hl, bc ld a, [hl] @@ -730,10 +730,10 @@ Function45a0: ; 01:45a0 ld [hl], a ret -Unknown45d0: ; 01:45d0 +Unknown45d0: db $00, $0C, $04, $08 -Function45d4: ; 01:45d4 +Function45d4: ld hl, $0010 add hl, bc ld a, [hl] @@ -759,7 +759,7 @@ Function45d4: ; 01:45d4 call Function4636 ret -Function45fe: ; 01:45fe +Function45fe: ld hl, $0012 add hl, bc ld a, [hl] @@ -774,7 +774,7 @@ Function45fe: ; 01:45fe ld [hl], a ret -Function4613: ; 01:4613 +Function4613: ld hl, $0005 add hl, bc bit 3, [hl] @@ -796,7 +796,7 @@ Function4613: ; 01:4613 call Function4636 ret -Function4636: ; 01:4636 +Function4636: and $f0 cp $70 nop @@ -807,14 +807,14 @@ Function4636: ; 01:4636 and a ret -Function4644: ; 01:4644 +Function4644: ld hl, $0005 add hl, bc set 7, [hl] scf ret -Function464c: ; 01:464c +Function464c: call .sub_465f jr c, .sub_4658 ld hl, $0005 @@ -848,7 +848,7 @@ Function464c: ; 01:464c scf ret -Function4678: ; 01:4678 +Function4678: xor a ld hl, $000a add hl, bc @@ -861,7 +861,7 @@ Function4678: ; 01:4678 ld [hl], $ff ret -Function468a: ; 01:468a +Function468a: and $0f ld hl, $0006 add hl, bc @@ -877,7 +877,7 @@ Function468a: ; 01:468a and $0c ld [hl], a -Function46a2: ; 01:46a2 +Function46a2: call Function46e5 ld hl, $0009 add hl, bc @@ -908,7 +908,7 @@ Function46a2: ; 01:46a2 ld [hl], a ret -Function46d3: ; 01:46d3 +Function46d3: call Function46e5 ld hl, $0018 add hl, bc @@ -922,7 +922,7 @@ Function46d3: ; 01:46d3 ld [hl], a ret -Function46e5: ; 01:46e5 +Function46e5: ld hl, $0006 add hl, bc ld l, [hl] @@ -939,7 +939,7 @@ Function46e5: ; 01:46e5 ld h, [hl] ret -Function46f9: ; 01:46f9 +Function46f9: ld hl, $0006 add hl, bc ld l, [hl] @@ -951,10 +951,10 @@ Function46f9: ; 01:46f9 ld a, [hl] ret -Table4708: ; 01:4708 +Table4708: db $00, $01, $10 -Table470b: ; 01:470b +Table470b: db $01, $00, $ff db $10, $01, $ff db $00, $10, $01 @@ -977,7 +977,7 @@ Table470b: ; 01:470b db $08, $00, $02 db $08 -Function4748: ; 01:4748 +Function4748: add a ret z ld a, $01 @@ -985,7 +985,7 @@ Function4748: ; 01:4748 ld a, $ff ret -Function4750: ; 01:4750 +Function4750: ld hl, $0006 add hl, bc ld a, [hl] @@ -1000,7 +1000,7 @@ Function4750: ; 01:4750 set 5, [hl] ret -Function476b: ; 01:476b +Function476b: ld a, [wXCoord] ld d, a ld hl, $0010 @@ -1025,31 +1025,31 @@ Function476b: ; 01:476b ld [hl], a ret -Function4792: ; 01:4792 +Function4792: ld hl, $001d add hl, bc ld [hl], $00 ret -Function4799: ; 01:4799 +Function4799: ld hl, $001d add hl, bc inc [hl] ret -Function479f: ; 01:479f +Function479f: ld hl, $001d add hl, bc ld a, [hl] ret -Function47a5: ; 01:47a5 +Function47a5: ld hl, $001d add hl, bc ld [hl], a ret -Function47ab: ; 01:47ab +Function47ab: ld hl, $001d add hl, bc ld l, [hl] @@ -1061,7 +1061,7 @@ Function47ab: ; 01:47ab ld l, a jp hl -Function47b8: ; 01:47b8 +Function47b8: ld hl, $0003 add hl, bc ld a, [hl] @@ -1069,7 +1069,7 @@ Function47b8: ; 01:47b8 ld hl, Table47c5 jp CallJumptable -Table47c5: ; 01:47c5 +Table47c5: dw Function47fb dw Function4812 dw Function481c @@ -1098,29 +1098,29 @@ Table47c5: ; 01:47c5 dw Function4865 dw Function4868 -Function47fb: ; 01:47fb +Function47fb: ret -Function47fc: ; 01:47fc +Function47fc: call Random ldh a, [hRandomAdd] and $01 jp Function48a9 -Function4806: ; 01:4806 +Function4806: call Random ldh a, [hRandomAdd] and $01 or $02 jp Function48a9 -Function4812: ; 01:4812 +Function4812: call Random ldh a, [hRandomAdd] and $03 jp Function48a9 -Function481c: ; 01:481c +Function481c: call Random ldh a, [hRandomAdd] and $0c @@ -1129,22 +1129,22 @@ Function481c: ; 01:481c ld [hl], a jp Function48da -Function482b: ; 01:482b +Function482b: ld a, $00 jr Function4839 -Function482f: ; 01:482f +Function482f: ld a, $04 jr Function4839 -Function4833: ; 01:4833 +Function4833: ld a, $08 jr Function4839 -Function4837: ; 01:4837 +Function4837: ld a, $0c -Function4839: ; 01:4839 +Function4839: ld hl, $0007 add hl, bc ld [hl], a @@ -1155,37 +1155,37 @@ Function4839: ; 01:4839 ld [hl], $04 jp Function4b78 -Function484d: ; 01:484d +Function484d: ld hl, $0008 add hl, bc ld [hl], $07 jp Function4bed -Function4856: ; 01:4856 +Function4856: jp Function4bf9 -Function4859: ; 01:4859 +Function4859: jp Function4c0c -Function485c: ; 01:485c +Function485c: jp Function4fbc -Function485f: ; 01:485f +Function485f: jp Function4bf3 -Function4862: ; 01:4862 +Function4862: jp Function4fbc -Function4865: ; 01:4865 +Function4865: jp Function4c1f -Function4868: ; 01:4868 +Function4868: ret -Function4869: ; 01:4869 +Function4869: ret -Function486a: ; 01:486a +Function486a: ld hl, $0010 add hl, bc ld d, [hl] @@ -1206,7 +1206,7 @@ Function486a: ; 01:486a ld [hl], a ret -Function488c: ; 01:488c +Function488c: call Function468a call Function771e jr c, Function48d4 @@ -1221,7 +1221,7 @@ Function488c: ; 01:488c ld [hl], $02 jp Function4b88 -Function48a9: ; 01:48a9 +Function48a9: call Function468a call Function771e jr c, Function48d4 @@ -1236,7 +1236,7 @@ Function48a9: ; 01:48a9 ld [hl], $06 jp Function4baa -Function48c6: ; 01:48c6 +Function48c6: ld hl, $0008 add hl, bc ld [hl], $05 @@ -1244,11 +1244,11 @@ Function48c6: ; 01:48c6 set 7, [hl] jp Function4bc9 -Function48d4: ; 01:48d4 +Function48d4: call Function4678 call Function45fe -Function48da: ; 01:48da +Function48da: ld hl, $0006 add hl, bc ld [hl], $ff @@ -1263,7 +1263,7 @@ Function48da: ; 01:48da ld [hl], a jp Function4b65 -Function48f5: ; 01:48f5 +Function48f5: ld hl, $0008 add hl, bc ld [hl], $01 @@ -1296,7 +1296,7 @@ Function48f5: ; 01:48f5 call Function45fe ret -Function4930: ; 01:4930 +Function4930: ld a, [wPlayerNextMapX] ld d, a ld a, [wPlayerNextMapY] @@ -1348,10 +1348,10 @@ Function4930: ; 01:4930 cpl ret -Function4979: ; 01:4979 +Function4979: ret -Function497a: ; 01:497a +Function497a: ld hl, $001e add hl, bc inc [hl] @@ -1369,11 +1369,11 @@ Function497a: ; 01:497a ld [hl], a ret -Table4994: ; 01:4994 +Table4994: db $00, $FF, $FE, $FD db $FC, $FD, $FE, $FF -Function499c: ; 01:499c +Function499c: call Function46f9 ld hl, $001f add hl, bc @@ -1412,7 +1412,7 @@ Function499c: ; 01:499c ld [hl], $02 ret -Unknown49dc: ; 01:49dc +Unknown49dc: db $FC, $FB, $FA, $F9 db $F8, $F7, $F6, $F5 db $F5, $F5, $F4, $F4 @@ -1422,23 +1422,23 @@ Unknown49dc: ; 01:49dc db $FA, $FB, $FC, $FE db $FF, $00, $00, $00 -Function49fc: ; 01:49fc +Function49fc: ld hl, $0008 add hl, bc ld [hl], $11 call Function4792 -Function4a05: ; 01:4a05 +Function4a05: ld de, Table4a0b jp Function47ab -Table4a0b: ; 01:4a0b +Table4a0b: dw Function4a13 dw Function4a28 dw Function4a38 dw Function4a53 -Function4a13: ; 01:4a13 +Function4a13: ld hl, $001e add hl, bc ld [hl], $04 @@ -1450,7 +1450,7 @@ Function4a13: ; 01:4a13 ld [hl], $10 call Function4799 -Function4a28: ; 01:4a28 +Function4a28: ld hl, $000a add hl, bc ld [hl], $03 @@ -1461,7 +1461,7 @@ Function4a28: ; 01:4a28 call Function4799 ret -Function4a38: ; 01:4a38 +Function4a38: ld hl, $001e add hl, bc ld [hl], $04 @@ -1476,7 +1476,7 @@ Function4a38: ; 01:4a38 ld [hl], $10 call Function4799 -Function4a53: ; 01:4a53 +Function4a53: ld hl, $000a add hl, bc ld [hl], $03 @@ -1504,17 +1504,17 @@ Function4a53: ; 01:4a53 call Function4792 ret -Function4a82: ; 01:4a82 +Function4a82: ld hl, $0008 add hl, bc ld [hl], $12 call Function4792 -Function4a8b: ; 01:4a8b +Function4a8b: ld de, Table4a91 jp Function47ab -Table4a91: ; 01:4a91 +Table4a91: dw Function4a9f dw Function4aaf dw Function4ab8 @@ -1523,7 +1523,7 @@ Table4a91: ; 01:4a91 dw Function4b00 dw Function4b0c -Function4a9f: ; 01:4a9f +Function4a9f: ld hl, $000a add hl, bc ld [hl], $00 @@ -1533,14 +1533,14 @@ Function4a9f: ; 01:4a9f call Function4799 ret -Function4aaf: ; 01:4aaf +Function4aaf: ld hl, $0009 add hl, bc dec [hl] ret nz call Function4799 -Function4ab8: ; 01:4ab8 +Function4ab8: ld hl, $000b add hl, bc ld [hl], $00 @@ -1556,7 +1556,7 @@ Function4ab8: ; 01:4ab8 call Function4799 ret -Function4ad4: ; 01:4ad4 +Function4ad4: ld hl, $000a add hl, bc ld [hl], $03 @@ -1577,14 +1577,14 @@ Function4ad4: ; 01:4ad4 ret nz call Function4799 -Function4af6: ; 01:4af6 +Function4af6: ld hl, $0009 add hl, bc ld [hl], $10 call Function4799 ret -Function4b00: ; 01:4b00 +Function4b00: ld hl, $000a add hl, bc ld [hl], $03 @@ -1593,7 +1593,7 @@ Function4b00: ; 01:4b00 dec [hl] ret nz -Function4b0c: ; 01:4b0c +Function4b0c: ld hl, $0008 add hl, bc ld [hl], $01 @@ -1606,13 +1606,13 @@ Function4b0c: ; 01:4b0c call Function4792 ret -Function4b22: ; 01:4b22 +Function4b22: call Function4792 -Function4b25: ; 01:4b25 +Function4b25: ret -Function4b26: ; 01:4b26 +Function4b26: ld a, $01 ld [wcb70], a push bc @@ -1631,10 +1631,10 @@ Function4b26: ; 01:4b26 ld [hl], a ret -Unknown4b42: ; 01:4b42 +Unknown4b42: db $01, $01, $FC, $02, $00, $08 -Function4b48: ; 01:4b48 +Function4b48: ld e, a add a add e @@ -1651,10 +1651,10 @@ Function4b48: ; 01:4b48 ld [wcb70], a ret -Unknown4b5f: ; 01:4b5f +Unknown4b5f: db $05, $04, $FC, $02, $02, $08 -Function4b65: ; 01:4b65 +Function4b65: ld hl, $000a add hl, bc ld [hl], $02 @@ -1667,7 +1667,7 @@ Function4b65: ; 01:4b65 ld [hl], $01 ret -Function4b78: ; 01:4b78 +Function4b78: call Function4979 ld hl, $000a add hl, bc @@ -1677,7 +1677,7 @@ Function4b78: ; 01:4b78 ld [hl], $ff ret -Function4b88: ; 01:4b88 +Function4b88: call Function4979 ld hl, $000a add hl, bc @@ -1696,7 +1696,7 @@ Function4b88: ; 01:4b88 ld [hl], $ff ret -Function4baa: ; 01:4baa +Function4baa: ld hl, $000a add hl, bc ld [hl], $01 @@ -1714,7 +1714,7 @@ Function4baa: ; 01:4baa ld [hl], $01 ret -Function4bc9: ; 01:4bc9 +Function4bc9: ld hl, $000a add hl, bc ld [hl], $01 @@ -1734,15 +1734,15 @@ Function4bc9: ; 01:4bc9 ld [hl], $ff ret -Function4bed: ; 01:4bed +Function4bed: ld a, [wPlayerMovement] jp Function4c37 -Function4bf3: ; 01:4bf3 +Function4bf3: ld a, [wMovementObject] jp Function4c37 -Function4bf9: ; 01:4bf9 +Function4bf9: ld hl, $001c add hl, bc ld e, [hl] @@ -1756,7 +1756,7 @@ Function4bf9: ; 01:4bf9 ld a, [hl] jp Function4c37 -Function4c0c: ; 01:4c0c +Function4c0c: ld hl, $001c add hl, bc ld e, [hl] @@ -1770,7 +1770,7 @@ Function4c0c: ; 01:4c0c ld a, [hl] jp Function4c37 -Function4c1f: ; 01:4c1f +Function4c1f: ld hl, $001c add hl, bc ld e, [hl] @@ -1785,7 +1785,7 @@ Function4c1f: ; 01:4c1f call GetFarByte jp Function4c37 -Function4c37: ; 01:4c37 +Function4c37: push af call Function4f86 pop af @@ -1799,7 +1799,7 @@ Function4c37: ; 01:4c37 ld l, a jp hl -Table4c48: ; 01:4c48 +Table4c48: dw Function4d94 dw Function4d98 dw Function4d9c @@ -1857,13 +1857,13 @@ Table4c48: ; 01:4c48 dw Function49fc dw Function4a82 -Function4cb8: ; 01:4cb8 +Function4cb8: ld hl, $001c add hl, bc ld [hl], $00 jp Function47b8 -Function4cc1: ; 01:4cc1 +Function4cc1: ld hl, $0001 add hl, bc ld a, [hl] @@ -1892,7 +1892,7 @@ Function4cc1: ; 01:4cc1 res 7, [hl] ret -Function4cef: ; 01:4cef +Function4cef: push bc ld hl, $0001 add hl, bc @@ -1919,7 +1919,7 @@ Function4cef: ; 01:4cef res 7, [hl] ret -Function4d1a: ; 01:4d1a +Function4d1a: ld hl, $000a add hl, bc ld [hl], $02 @@ -1930,38 +1930,38 @@ Function4d1a: ; 01:4d1a res 7, [hl] ret -Function4d2c: ; 01:4d2c +Function4d2c: ld a, $01 jr Function4d4a -Function4d30: ; 01:4d30 +Function4d30: ld a, $02 jr Function4d4a -Function4d34: ; 01:4d34 +Function4d34: ld a, $03 jr Function4d4a -Function4d38: ; 01:4d38 +Function4d38: ld a, $04 jr Function4d4a -Function4d3c: ; 01:4d3c +Function4d3c: ld a, $05 jr Function4d4a -Function4d40: ; 01:4d40 +Function4d40: ld a, $06 jr Function4d4a -Function4d44: ; 01:4d44 +Function4d44: ld a, $07 jr Function4d4a -Function4d48: ; 01:4d48 +Function4d48: ld a, $08 -Function4d4a: ; 01:4d4a +Function4d4a: ld hl, $0009 add hl, bc ld [hl], a @@ -1973,59 +1973,59 @@ Function4d4a: ; 01:4d4a ld [hl], $ff jp Function4b65 -Function4d5e: ; 01:4d5e +Function4d5e: ld hl, $0004 add hl, bc res 3, [hl] jp Function47b8 -Function4d67: ; 01:4d67 +Function4d67: ld hl, $0004 add hl, bc set 3, [hl] jp Function47b8 -Function4d70: ; 01:4d70 +Function4d70: ld hl, $0004 add hl, bc res 2, [hl] jp Function47b8 -Function4d79: ; 01:4d79 +Function4d79: ld hl, $0004 add hl, bc set 2, [hl] jp Function47b8 -Function4d82: ; 01:4d82 +Function4d82: ld hl, $0005 add hl, bc res 0, [hl] jp Function47b8 -Function4d8b: ; 01:4d8b +Function4d8b: ld hl, $0005 add hl, bc set 0, [hl] jp Function47b8 -Function4d94: ; 01:4d94 +Function4d94: ld a, $00 jr Function4da4 -Function4d98: ; 01:4d98 +Function4d98: ld a, $04 jr Function4da4 -Function4d9c: ; 01:4d9c +Function4d9c: ld a, $08 jr Function4da4 -Function4da0: ; 01:4da0 +Function4da0: ld a, $0c jr Function4da4 -Function4da4: ; 01:4da4 +Function4da4: ld hl, $0007 add hl, bc ld [hl], a @@ -2037,135 +2037,135 @@ Function4da4: ; 01:4da4 ld [hl], $ff ret -Function4db6: ; 01:4db6 +Function4db6: ld a, $00 jp Function4e56 -Function4dbb: ; 01:4dbb +Function4dbb: ld a, $01 jp Function4e56 -Function4dc0: ; 01:4dc0 +Function4dc0: ld a, $02 jp Function4e56 -Function4dc5: ; 01:4dc5 +Function4dc5: ld a, $03 jp Function4e56 -Function4dca: ; 01:4dca +Function4dca: ld a, $04 jp Function4e56 -Function4dcf: ; 01:4dcf +Function4dcf: ld a, $05 jp Function4e56 -Function4dd4: ; 01:4dd4 +Function4dd4: ld a, $06 jp Function4e56 -Function4dd9: ; 01:4dd9 +Function4dd9: ld a, $07 jp Function4e56 -Function4dde: ; 01:4dde +Function4dde: ld a, $08 jp Function4e56 -Function4de3: ; 01:4de3 +Function4de3: ld a, $09 jp Function4e56 -Function4de8: ; 01:4de8 +Function4de8: ld a, $0a jp Function4e56 -Function4ded: ; 01:4ded +Function4ded: ld a, $0b jp Function4e56 -Function4df2: ; 01:4df2 +Function4df2: ld a, $0c jp Function4e56 -Function4df7: ; 01:4df7 +Function4df7: ld a, $0d jp Function4e56 -Function4dfc: ; 01:4dfc +Function4dfc: ld a, $0e jp Function4e56 -Function4e01: ; 01:4e01 +Function4e01: ld a, $0f jp Function4e56 -Function4e06: ; 01:4e06 +Function4e06: ld a, $00 jp Function4e7c -Function4e0b: ; 01:4e0b +Function4e0b: ld a, $01 jp Function4e7c -Function4e10: ; 01:4e10 +Function4e10: ld a, $02 jp Function4e7c -Function4e15: ; 01:4e15 +Function4e15: ld a, $03 jp Function4e7c -Function4e1a: ; 01:4e1a +Function4e1a: ld a, $04 jp Function4e7c -Function4e1f: ; 01:4e1f +Function4e1f: ld a, $05 jp Function4e7c -Function4e24: ; 01:4e24 +Function4e24: ld a, $06 jp Function4e7c -Function4e29: ; 01:4e29 +Function4e29: ld a, $07 jp Function4e7c -Function4e2e: ; 01:4e2e +Function4e2e: ld a, $08 jp Function4e7c -Function4e33: ; 01:4e33 +Function4e33: ld a, $09 jp Function4e7c -Function4e38: ; 01:4e38 +Function4e38: ld a, $0a jp Function4e7c -Function4e3d: ; 01:4e3d +Function4e3d: ld a, $0b jp Function4e7c -Function4e42: ; 01:4e42 +Function4e42: ld a, $0c jp Function4e7c -Function4e47: ; 01:4e47 +Function4e47: ld a, $0d jp Function4e7c -Function4e4c: ; 01:4e4c +Function4e4c: ld a, $0e jp Function4e7c -Function4e51: ; 01:4e51 +Function4e51: ld a, $0f jp Function4e7c -Function4e56: ; 01:4e56 +Function4e56: call Function468a call Function4613 ld a, [wCenteredObject] @@ -2185,7 +2185,7 @@ Function4e56: ; 01:4e56 ld [hl], $05 jp Function4bc9 -Function4e7c: ; 01:4e7c +Function4e7c: call Function468a ld hl, $001f add hl, bc @@ -2215,7 +2215,7 @@ Function4e7c: ; 01:4e7c ld [hl], $10 jp Function4f14 -Function4eb7: ; 01:4eb7 +Function4eb7: call Function468a ld hl, $0008 add hl, bc @@ -2231,15 +2231,15 @@ Function4eb7: ; 01:4eb7 ld [hl], $00 call Function4792 -Function4ed5: ; 01:4ed5 +Function4ed5: ld de, Table4edb jp Function47ab -Table4edb: ; 01:4edb +Table4edb: dw Function4edf dw Function4efb -Function4edf: ; 01:4edf +Function4edf: call Function46d3 call Function499c ld hl, $0009 @@ -2254,7 +2254,7 @@ Function4edf: ; 01:4edf res 3, [hl] ret -Function4efb: ; 01:4efb +Function4efb: call Function46d3 call Function499c ld hl, $0009 @@ -2268,16 +2268,16 @@ Function4efb: ; 01:4efb call Function4792 ret -Function4f14: ; 01:4f14 +Function4f14: ld de, Table4f1a jp Function47ab -Table4f1a: ; 01:4f1a +Table4f1a: dw Function4f20 dw Function4f40 dw Function4f4b -Function4f20: ; 01:4f20 +Function4f20: call Function499c call Function4750 ld hl, $0009 @@ -2294,13 +2294,13 @@ Function4f20: ; 01:4f20 call Function4799 ret -Function4f40: ; 01:4f40 +Function4f40: call Function46a2 ld hl, wcb6e set 7, [hl] call Function4799 -Function4f4b: ; 01:4f4b +Function4f4b: call Function499c call Function4750 ld hl, $0009 @@ -2334,7 +2334,7 @@ Function4f4b: ; 01:4f4b ret z jp Function4b25 -Function4f86: ; 01:4f86 +Function4f86: ld e, a ld a, [wObjectFollow_Follower] and a @@ -2372,7 +2372,7 @@ Function4f86: ; 01:4f86 ld [hl], a ret -Function4fbc: ; 01:4fbc +Function4fbc: call .sub_4fc5 ld hl, Table4c48 jp CallJumptable @@ -2423,7 +2423,7 @@ Function4fbc: ; 01:4fbc scf ret -Function5007: ; 01:5007 +Function5007: ld bc, wObjectStructs xor a .sub_500b @@ -2542,7 +2542,7 @@ Function5007: ; 01:5007 scf ret -Function50b9: ; 01:50b9 +Function50b9: call .sub_50c3 call .sub_50d3 call Function42db @@ -2671,7 +2671,7 @@ Function50b9: ; 01:50b9 pop bc ret -_UpdateSprites: ; 01:5190 +_UpdateSprites: ld a, [wVramState] bit 0, a ret z @@ -2900,7 +2900,7 @@ _UpdateSprites: ; 01:5190 pop af ret -Function52dc: ; 01:52dc +Function52dc: call MenuBoxCoord2Tile push hl ld de, $005a @@ -2919,7 +2919,7 @@ Function52dc: ; 01:52dc SECTION "engine/dumps/bank01.asm@Function5388", ROMX -Function5388: ; 01:5388 +Function5388: ld a, $00 call OpenSRAM ld a, [s0_a600] @@ -2927,7 +2927,7 @@ Function5388: ; 01:5388 call CloseSRAM ret -Function5397: ; 01:5397 +Function5397: ld a, $00 call OpenSRAM ld hl, s0_a600 @@ -2941,7 +2941,7 @@ Function5397: ; 01:5397 call CloseSRAM ret -Function53b0: ; 01:53b0 +Function53b0: ld a, $00 call OpenSRAM ld hl, wDebugFlags @@ -2958,7 +2958,7 @@ Function53b0: ; 01:53b0 SECTION "engine/dumps/bank01.asm@ReanchorBGMap_NoOAMUpdate", ROMX -ReanchorBGMap_NoOAMUpdate: ; 01:63d8 +ReanchorBGMap_NoOAMUpdate: xor a ldh [hLCDCPointer], a ld hl, wMapObjectsEnd @@ -3009,7 +3009,7 @@ ReanchorBGMap_NoOAMUpdate: ; 01:63d8 jr nz, .sub_6422 ret -LoadFonts_NoOAMUpdate: ; 01:6437 +LoadFonts_NoOAMUpdate: call UpdateSprites call LoadFont call LoadFontExtra @@ -3018,7 +3018,7 @@ LoadFonts_NoOAMUpdate: ; 01:6437 ret -Function6445: ; 01:6445 +Function6445: call BackUpTilesToBuffer ld a, [wWhichPokemon] ld hl, wPartyMonNicknames @@ -3183,78 +3183,78 @@ Function6445: ; 01:6445 scf ret -Text658c: ; 01:658c +Text658c: text_from_ram wcd11 text "は あたらしく" line "" text_end -Text6599: ; 01:6599 +Text6599: text_from_ram wStringBuffer2 text "を おぼえた！" text_end -Text65a5: ; 01:65a5 +Text65a5: sound_dex_fanfare_50_79 text_waitbutton text_end -Text65a8: ; 01:65a8 +Text65a8: text "どの わざを" next "わすれさせたい？" done -Text65b9: ; 01:65b9 +Text65b9: text "それでは<⋯⋯> " text_end -Text65c1: ; 01:65c1 +Text65c1: text_from_ram wStringBuffer2 text "を" line "おぼえるのを あきらめますか？" done -Text65d7: ; 01:65d7 +Text65d7: text_from_ram wcd11 text "は " text_end -Text65de: ; 01:65de +Text65de: text_from_ram wStringBuffer2 text "を" line "おぼえずに おわった！" prompt -Text65f0: ; 01:65f0 +Text65f0: text_from_ram wcd11 text "は あたらしく" line "" text_end -Text65fd: ; 01:65fd +Text65fd: text_from_ram wStringBuffer2 text "を おぼえたい<⋯⋯>！" para "しかし " text_end -Text6610: ; 01:6610 +Text6610: text_from_ram wcd11 text "は わざを ４つ" line "おぼえるので せいいっぱいだ！" para "" text_end -Text662e: ; 01:662e +Text662e: text_from_ram wStringBuffer2 text "の かわりに" line "ほかの わざを わすれさせますか？" done -Text664b: ; 01:664b +Text664b: text "１ ２の <⋯⋯>" text_end -Text6653: ; 01:6653 +Text6653: text_exit start_asm push de @@ -3264,34 +3264,34 @@ Text6653: ; 01:6653 ld hl, Text6661 ret -Text6661: ; 01:6661 +Text6661: text " ポカン！" text_end -Text6668: ; 01:6668 +Text6668: text_exit text "" para "" text_end -Text666c: ; 01:666c +Text666c: text_from_ram wcd11 text "は " text_end -Text6673: ; 01:6673 +Text6673: text_from_ram wStringBuffer1 text "の" line "つかいかたを きれいに わすれた！" para "そして<⋯⋯>！" prompt -Text6691: ; 01:6691 +Text6691: text "それは たいせつなわざです" line "わすれさせることは できません！" prompt -Function66b1: ; 01:66b1 +Function66b1: ld hl, wcd74 ld a, [hli] ld h, [hl] @@ -3341,7 +3341,7 @@ Function66b1: ; 01:66b1 ldh [hSpriteOffset], a ret -Table66fa: ; 01:66fa +Table66fa: db $32, $21, $34, $24 db $34, $21, $45, $55 db $32, $32, $55, $52 @@ -3350,7 +3350,7 @@ Table66fa: ; 01:66fa db $22, $52, $24, $34 db $42 -Function6713: ; 01:6713 +Function6713: push hl call LoadStandardMenuHeader ld a, [wBattleMode] @@ -3408,13 +3408,13 @@ Function6713: ; 01:6713 call CloseWindow ret -Text6788: ; 01:6788 +Text6788: text_from_ram wStringBuffer1 text "に" line "ニックネームを つけますか？" done -Function679d: ; 01:679d +Function679d: ld de, wFieldMoveScriptID push de ld hl, NamingScreen @@ -3443,7 +3443,7 @@ Function679d: ; 01:679d scf ret -CorrectNickErrors: ; 01:67d5 +CorrectNickErrors: push bc push de ld b, $06 @@ -3483,14 +3483,14 @@ CorrectNickErrors: ; 01:67d5 pop bc ret -Table6805:: ; 01:6805 +Table6805:: db $00, $05, $14, $19, $1d db $26, $35, $3a, $49, $7f db $ff SECTION "engine/dumps/bank01.asm@Function771e", ROMX -Function771e: ; 01:771e +Function771e: ld hl, $0004 add hl, bc bit 4, [hl] @@ -3525,7 +3525,7 @@ Function771e: ; 01:771e SECTION "engine/dumps/bank01.asm@Function776e", ROMX -Function776e: ; 01:776e +Function776e: call GetFacingTileCoord cp $90 jr z, .sub_7779 @@ -3561,7 +3561,7 @@ Function776e: ; 01:776e scf ret -Function77a1: ; 01:77a1 +Function77a1: ld hl, $0010 add hl, bc ld d, [hl] @@ -3570,7 +3570,7 @@ Function77a1: ; 01:77a1 ld e, [hl] jr _CheckObjectCollision -Function77ad: ; 01:77ad +Function77ad: ldh a, [hConnectionStripLength] call GetObjectStruct call .sub_77b9 @@ -3607,7 +3607,7 @@ Function77ad: ; 01:77ad SECTION "engine/dumps/bank01.asm@Function782c", ROMX -Function782c: ; 01:782c +Function782c: ld hl, $0016 add hl, bc ld a, [hl] @@ -3660,7 +3660,7 @@ Function782c: ; 01:782c scf ret -Function786e: ; 01:786e +Function786e: ld hl, $0010 add hl, bc ld a, [wXCoord] @@ -3689,16 +3689,16 @@ Function786e: ; 01:786e SECTION "engine/dumps/bank01.asm@SettingsScreen", ROMX -SettingsScreen: ; 01:78e5 +SettingsScreen: ld a, [wVramState] push af xor a ld [wVramState], a -Function78ed: ; 01:78ed +Function78ed: call Function7a93 -Function78f0: ; 01:78f0 +Function78f0: call Function7a41 ld [hl], $ed call Function7a55 @@ -3760,7 +3760,7 @@ Function78f0: ; 01:78f0 call LoadFontExtra jr Function78f0 -Function796a: ; 01:796a +Function796a: push af call Function7a41 ld [hl], $7f @@ -3768,7 +3768,7 @@ Function796a: ; 01:796a ld [wTileMapBackup], a jp Function78f0 -Function7977: ; 01:7977 +Function7977: ld a, [wc409] bit 7, b jr nz, .sub_799e @@ -3873,7 +3873,7 @@ Function7977: ; 01:7977 ld [wTileMapBackup], a jp Function78f0 -Function7a41: ; 01:7a41 +Function7a41: ld a, [wc409] ld hl, wTileMap ld bc, $0014 @@ -3884,7 +3884,7 @@ Function7a41: ; 01:7a41 add hl, bc ret -Function7a55: ; 01:7a55 +Function7a55: ld hl, Table7c22 ld a, [wc40a] ld c, a @@ -3927,7 +3927,7 @@ Function7a55: ; 01:7a55 ld [wce5f], a ret -Function7a93: ; 01:7a93 +Function7a93: call ClearBGPalettes call DisableLCD xor a @@ -4049,42 +4049,42 @@ Function7a93: ; 01:7a93 ld [hl], a ret -Text7bad: ; 01:7bad +Text7bad: db "はなしの はやさ" next " はやい ふつう おそい" text_end -Text7bc9: ; 01:7bc9 +Text7bc9: db "せんとう アニメーション" next " じっくり みる とばして みる" text_end -Text7be8: ; 01:7be8 +Text7be8: db "しあいの ルール" next " いれかえタイプ かちぬきタイプ" text_end -Text7c03: ; 01:7c03 +Text7c03: db " モノラル ステレオ" text_end -Text7c12: ; 01:7c12 +Text7c12: db " おわり" text_end -Text7c17: ; 01:7c17 +Text7c17: db " わく を かえる " text_end -Table7c22: ; 01:7c22 +Table7c22: db $0F -Table7c23: ; 01:7c23 +Table7c23: db $05, $08, $03 db $01, $01, $08 db $FF -Unknown7c2a: ; 01:7c2a +Unknown7c2a: rept 491 db $39, $00 endr diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index 5f373b6..94ecb7c 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank02.asm@Function8000", ROMX -Function8000: ; 02:4000 +Function8000: ld a, $00 ld hl, Data8022 call Function1656 @@ -18,11 +18,11 @@ Function8000: ; 02:4000 call Function1908 ret -Data8022: ; 02:4022 +Data8022: db $01, $00, $00, $10, $ee, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -Function8031: ; 02:4031 +Function8031: call Function8047 ld a, [wUsedSprites+1] ld [wMap1ObjectSprite], a @@ -33,7 +33,7 @@ Function8031: ; 02:4031 call StartFollow ret -Function8047: ; 02:4047 +Function8047: ld a, $01 ld hl, Data805d call Function1656 @@ -44,11 +44,11 @@ Function8047: ; 02:4047 ld [wMap1ObjectYCoord], a ret -Data805d: ; 02:405d +Data805d: db $4d, $00, $00, $18, $ff, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -Function806c: ; 02:406c +Function806c: ld a, $01 call Function169f xor a @@ -57,7 +57,7 @@ Function806c: ; 02:406c ld [wObjectFollow_Leader], a ret -Function807b: ; 02:407b +Function807b: ld a, $01 ld hl, Data8089 call Function1656 @@ -65,11 +65,11 @@ Function807b: ; 02:407b call Function1668 ret -Data8089: ; 02:4089 +Data8089: db $01, $00, $00, $17, $ee, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -_InitializeVisibleSprites: ; 02:4098 +_InitializeVisibleSprites: ld bc, wMap2Object ld a, $02 .sub_809d @@ -119,10 +119,10 @@ _InitializeVisibleSprites: ; 02:4098 jr nz, .sub_809d ret -Function80ea: ; 02:40ea +Function80ea: ret -Function80eb: ; 02:40eb +Function80eb: call Function811a and a ret nz @@ -153,7 +153,7 @@ Function80eb: ; 02:40eb set 5, [hl] ret -Function811a: ; 02:411a +Function811a: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -162,7 +162,7 @@ Function811a: ; 02:411a ld a, [hl] ret -Function8125: ; 02:4125 +Function8125: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -171,7 +171,7 @@ Function8125: ; 02:4125 ld [hl], $ff ret -Function8131: ; 02:4131 +Function8131: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -180,7 +180,7 @@ Function8131: ; 02:4131 ld [hl], $00 ret -Function813d: ; 02:413d +Function813d: ldh a, [hConnectionStripLength] ld hl, $0001 add hl, de @@ -263,7 +263,7 @@ Function813d: ; 02:413d and a ret -Function81ce: ; 02:41ce +Function81ce: ld hl, $0004 add hl, de ld [hl], $70 @@ -291,7 +291,7 @@ Function81ce: ; 02:41ce set 4, [hl] ret -Function81f8: ; 02:41f8 +Function81f8: push af swap a and $0f @@ -307,7 +307,7 @@ Function81f8: ; 02:41f8 ld [hl], a ret -Function820d: ; 02:420d +Function820d: push af ldh a, [hConnectionStripLength] cp $00 @@ -349,11 +349,11 @@ Function820d: ; 02:420d pop hl ret -Data8242: ; 02:4242 +Data8242: db $18, $24, $30, $3c, $48, $54, $60, $6c db $78, $7c -Function824c: ; 02:424c +Function824c: nop ld a, [wPlayerStepDirection] cp $ff @@ -361,58 +361,58 @@ Function824c: ; 02:424c ld hl, Table8259 jp CallJumptable -Table8259: ; 02:4259 +Table8259: dw Function8299 dw Function8292 dw Function82e6 dw Function82ed -Function8261: ; 02:4261 +Function8261: ret -Function8262: ; 02:4262 +Function8262: ld a, [wPlayerStepDirection] cp $ff ret z ld hl, Table826e jp CallJumptable -Table826e: ; 02:426e +Table826e: dw Function827d dw Function8276 dw Function8284 dw Function828b -Function8276: ; 02:4276 +Function8276: ld a, [wYCoord] sub $02 jr Function829e -Function827d: ; 02:427d +Function827d: ld a, [wYCoord] add $0a jr Function829e -Function8284: ; 02:4284 +Function8284: ld a, [wXCoord] sub $02 jr Function82f2 -Function828b: ; 02:428b +Function828b: ld a, [wXCoord] add $0b jr Function82f2 -Function8292: ; 02:4292 +Function8292: ld a, [wYCoord] sub $01 jr Function829e -Function8299: ; 02:4299 +Function8299: ld a, [wYCoord] add $09 -Function829e: ; 02:429e +Function829e: ld d, a ld a, [wXCoord] ld e, a @@ -459,16 +459,16 @@ Function829e: ; 02:429e jr nz, .sub_82a8 ret -Function82e6: ; 02:42e6 +Function82e6: ld a, [wXCoord] sub $01 jr Function82f2 -Function82ed: ; 02:42ed +Function82ed: ld a, [wXCoord] add $0a -Function82f2: ; 02:42f2 +Function82f2: ld e, a ld a, [wYCoord] ld d, a @@ -515,7 +515,7 @@ Function82f2: ; 02:42f2 jr nz, .sub_82fc ret -Function833a: ; 02:433a +Function833a: ld a, c push af call InitMovementBuffer @@ -555,7 +555,7 @@ Function833a: ; 02:433a xor a ret -Function837c: ; 02:437c +Function837c: call InitMovementBuffer push bc ld a, b @@ -578,7 +578,7 @@ Function837c: ; 02:437c call AppendToMovementBuffer ret -Function83a2: ; 02:43a2 +Function83a2: push de call InitMovementBuffer pop de @@ -587,7 +587,7 @@ Function83a2: ; 02:43a2 call AppendToMovementBuffer ret -Function83b0: ; 02:43b0 +Function83b0: push de push bc ld a, c @@ -623,7 +623,7 @@ Function83b0: ; 02:43b0 call ComputePathToWalkToPlayer ret -Function83e8: ; 02:43e8 +Function83e8: ld hl, wcb70 push hl ld a, [hl] @@ -639,7 +639,7 @@ Function83e8: ; 02:43e8 push de ret -Table83fb: ; 02:43fb +Table83fb: dw Function8432 dw Function844a dw Function8459 @@ -656,7 +656,7 @@ Table83fb: ; 02:43fb dw Function84af dw Function84b8 -Function8419: ; 02:4419 +Function8419: ld a, c ld [wVBCopyFarSrcBank], a ld a, l @@ -664,38 +664,38 @@ Function8419: ; 02:4419 ld a, h ld [wVBCopyFarSrc+1], a -Function8425: ; 02:4425 +Function8425: ld a, e ld [wVBCopyFarDst], a ld a, d ld [wVBCopyFarDst+1], a -Function842d: ; 02:442d +Function842d: ld a, b ld [wVBCopyFarSize], a ret -Function8432: ; 02:4432 +Function8432: ret -Function8433: ; 02:4433 +Function8433: ld hl, ShockEmoteGFX jr Function8440 -Function8438: ; 02:4438 +Function8438: ld hl, QuestionEmoteGFX jr Function8440 -Function843d: ; 02:443d +Function843d: ld hl, HappyEmoteGFX -Function8440: ; 02:4440 +Function8440: ld de, vChars1 + $780 ld b, $04 ld c, BANK(HappyEmoteGFX) jp Function8419 -Function844a: ; 02:444a +Function844a: ld [hl], $00 ld hl, JumpShadowGFX ld de, vChars1 + $7c0 @@ -703,7 +703,7 @@ Function844a: ; 02:444a ld c, BANK(JumpShadowGFX) jp Function8419 -Function8459: ; 02:4459 +Function8459: ld [hl], $00 ld hl, UnknownBouncingOrbGFX ld de, vChars1 + $7c0 @@ -711,7 +711,7 @@ Function8459: ; 02:4459 ld c, BANK(UnknownBouncingOrbGFX) jp Function8419 -Function8468: ; 02:4468 +Function8468: ld [hl], $00 ld hl, UnknownBallGFX ld de, vChars1 + $7c0 @@ -719,7 +719,7 @@ Function8468: ; 02:4468 ld c, BANK(UnknownBallGFX) jp Function8419 -Function8477: ; 02:4477 +Function8477: inc [hl] ld hl, GrampsSpriteGFX ld de, vChars0 @@ -727,23 +727,23 @@ Function8477: ; 02:4477 ld c, BANK(GrampsSpriteGFX) jp Function8419 -Function8485: ; 02:4485 +Function8485: inc [hl] ld b, $06 jp Function842d -Function848b: ; 02:448b +Function848b: inc [hl] ld de, vChars1 ld b, $06 jp Function8425 -Function8494: ; 02:4494 +Function8494: ld [hl], $00 ld b, $06 jp Function842d -Function849b: ; 02:449b +Function849b: inc [hl] ld hl, PippiSpriteGFX ld de, vChars0 @@ -751,25 +751,25 @@ Function849b: ; 02:449b ld c, BANK(PippiSpriteGFX) jp Function8419 -Function84a9: ; 02:44a9 +Function84a9: inc [hl] ld b, $06 jp Function842d -Function84af: ; 02:44af +Function84af: inc [hl] ld de, vChars1 ld b, $06 jp Function8425 -Function84b8: ; 02:44b8 +Function84b8: ld [hl], $00 ld b, $06 jp Function842d SECTION "engine/dumps/bank02.asm@QueueFollowerFirstStep", ROMX -QueueFollowerFirstStep: ; 02:45df +QueueFollowerFirstStep: call Function85f2 jr c, .sub_85ec ld [wFollowMovementQueue], a @@ -781,7 +781,7 @@ QueueFollowerFirstStep: ; 02:45df ld [wFollowerMovementQueueLength], a ret -Function85f2: ; 02:45f2 +Function85f2: ld a, [wObjectFollow_Leader] call GetObjectStruct ld hl, $0010 @@ -823,7 +823,7 @@ Function85f2: ; 02:45f2 scf ret -Function862e: ; 02:462e +Function862e: ld a, e and $3f cp $20 @@ -839,7 +839,7 @@ Function862e: ; 02:462e inc a ret -Function8644: ; 02:4644 +Function8644: ld e, a ld a, d ld d, $00 @@ -861,7 +861,7 @@ Function8644: ; 02:4644 jr nz, .sub_8653 ret -Data8660: ; 02:4660 +Data8660: dw $00 dw $19 dw $32 @@ -895,7 +895,7 @@ Data8660: ; 02:4660 dw $32 dw $19 -Function86a0: ; 02:46a0 +Function86a0: call Function881e ld hl, InitEffectObject ld a, BANK(InitEffectObject) @@ -915,7 +915,7 @@ Function86a0: ; 02:46a0 jr z, .sub_86b4 ret -FlyMap: ; 02:46cb +FlyMap: ld hl, hJoyDebounceSrc ld a, [hl] push af @@ -980,7 +980,7 @@ FlyMap: ; 02:46cb ldh [hJoyDebounceSrc], a ret -Function8747: ; 02:4747 +Function8747: ld a, [wFlyDestination] ld l, a ld h, $00 @@ -1012,10 +1012,10 @@ Function8747: ; 02:4747 ld [wFlyDestination], a ret -Text8776: ; 02:4776 +Text8776: db "とびさき を えらんでください@" -Function8786: ; 02:4786 +Function8786: ld a, [wFlyDestination] push af xor a @@ -1057,10 +1057,10 @@ Function8786: ; 02:4786 ld [wFlyDestination], a ret -Text87e4: ; 02:47e4 +Text87e4: db "の すみか@" -Function87ea: ; 02:47ea +Function87ea: ld a, [wFlyDestination] and $10 jr z, .sub_881a @@ -1099,7 +1099,7 @@ Function87ea: ; 02:47ea call ClearSprites ret -Function881e: ; 02:481e +Function881e: call ClearBGPalettes call ClearTileMap call UpdateSprites @@ -1122,7 +1122,7 @@ Function881e: ; 02:481e call GetSGBLayout ret -DecompTownMapTilemap: ; 02:4856 +DecompTownMapTilemap: ld de, TownMapTilemap .sub_8859 ld a, [de] @@ -1141,7 +1141,7 @@ DecompTownMapTilemap: ; 02:4856 inc de jr .sub_8859 -Function886a: ; 02:486a +Function886a: ld de, GoldSpriteGFX ld hl, vChars0 lb bc, BANK(GoldSpriteGFX), $04 @@ -1179,7 +1179,7 @@ Function886a: ; 02:486a ld [hl], d ret -Function88b3: ; 02:48b3 +Function88b3: ld de, PoppoSpriteGFX ld hl, vChars0 + $80 lb bc, BANK(PoppoSpriteGFX), $04 @@ -1196,7 +1196,7 @@ Function88b3: ; 02:48b3 ld [hl], $08 ret -TownMapTilemap: ; 02:48da +TownMapTilemap: db $04, $05 db $19, $01 db $1a, $08 @@ -1355,7 +1355,7 @@ TownMapTilemap: ; 02:48da SECTION "engine/dumps/bank02.asm@Data8a17", ROMX -Data8a17: ; 02:4a17 +Data8a17: db $0b db $ff @@ -1393,7 +1393,7 @@ Data8a17: ; 02:4a17 db $08, $08 db $ff -Data8a53: ; 02:4a53 +Data8a53: db $00, $00, $1c, $9c, $28, $9c, $34, $9c db $40, $9c, $4c, $9c, $5c, $9c, $6c, $94 db $6c, $84, $6c, $78, $6c, $6c, $64, $6c @@ -1406,7 +1406,7 @@ Data8a53: ; 02:4a53 db $3c, $14, $3c, $20, $48, $14, $54, $1c db $54, $2c, $54, $38, $3c, $44, $48, $2c -OpenTrainerGear: ; 02:4aab +OpenTrainerGear: ld hl, wce5f ld a, [hl] push af @@ -1437,7 +1437,7 @@ OpenTrainerGear: ; 02:4aab call ClearJoypad ret -Function8ae0: ; 02:4ae0 +Function8ae0: call ClearBGPalettes call DisableLCD call ClearSprites @@ -1469,7 +1469,7 @@ Function8ae0: ; 02:4ae0 ldh [rOBP1], a ret -Function8b2a: ; 02:4b2a +Function8b2a: ld hl, wTileMap ld bc, $0168 ld a, $7f @@ -1480,7 +1480,7 @@ Function8b2a: ; 02:4b2a call CopyBytes ret -Data8b42: ; 02:4b42 +Data8b42: db $0d, $1c, $1d, $0b, $1c, $1d, $0b, $1c db $1d, $0c, $01, $05, $05, $05, $05, $05 db $05, $05, $05, $02, $08, $1e, $1f, $0a @@ -1490,7 +1490,7 @@ Data8b42: ; 02:4b42 db $06, $04, $03, $06, $06, $06, $06, $06 db $06, $06, $06, $04 -Function8b7e: ; 02:4b7e +Function8b7e: coord hl, 1, 0 ld a, $10 call Function8b97 @@ -1502,7 +1502,7 @@ Function8b7e: ; 02:4b7e call Function8b97 ret -Function8b97: ; 02:4b97 +Function8b97: ld [hli], a inc a ld [hld], a @@ -1514,7 +1514,7 @@ Function8b97: ; 02:4b97 ld [hld], a ret -Function8ba3: ; 02:4ba3 +Function8ba3: call UpdateTime call GetJoypadDebounced ld a, [wJumptableIndex] @@ -1539,7 +1539,7 @@ Function8ba3: ; 02:4ba3 scf ret -Function8bd5: ; 02:4bd5 +Function8bd5: coord hl, 11, 1 ld a, $7f ld [hli], a @@ -1558,7 +1558,7 @@ Function8bd5: ; 02:4bd5 call PrintNumber ret -Function8bfd: ; 02:4bfd +Function8bfd: ld a, [wJumptableIndex] ld e, a ld d, $00 @@ -1570,7 +1570,7 @@ Function8bfd: ; 02:4bfd ld l, a jp hl -Table8c0c: ; 02:4c0c +Table8c0c: dw Function8c21 dw Function8c49 dw DrawMap @@ -1580,12 +1580,12 @@ Table8c0c: ; 02:4c0c dw Function8e6c dw Function8e9e -Function8c1c: ; 02:4c1c +Function8c1c: ld hl, wJumptableIndex inc [hl] ret -Function8c21: ; 02:4c21 +Function8c21: ld hl, InitEffectObject ld a, BANK(InitEffectObject) call FarCall_hl @@ -1603,7 +1603,7 @@ Function8c21: ; 02:4c21 call Function8c1c ret -Function8c49: ; 02:4c49 +Function8c49: ld hl, hJoySum ld a, [hl] and $02 @@ -1618,7 +1618,7 @@ Function8c49: ; 02:4c49 set 7, [hl] ret -Function8c5f: ; 02:4c5f +Function8c5f: ld a, [wFlyDestination] ld hl, wcb60 cp [hl] @@ -1633,10 +1633,10 @@ Function8c5f: ; 02:4c5f ld [wJumptableIndex], a ret -Unknown8c78: ; 02:4c78 +Unknown8c78: db $02, $04, $06, $02 -DrawMap: ; 02:4c7c +DrawMap: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1657,7 +1657,7 @@ DrawMap: ; 02:4c7c ld [hl], a ret -Function8cab: ; 02:4cab +Function8cab: ld hl, hJoyDown ld a, [hl] and $02 @@ -1666,7 +1666,7 @@ Function8cab: ; 02:4cab ld [wJumptableIndex], a ret -Function8cb7: ; 02:4cb7 +Function8cb7: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1741,7 +1741,7 @@ Function8cb7: ; 02:4cb7 ld [wcb61], a ret -Function8d62: ; 02:4d62 +Function8d62: ld hl, hJoyDown ld a, [hl] and $02 @@ -1750,7 +1750,7 @@ Function8d62: ; 02:4d62 ld [wJumptableIndex], a ret -Function8d6e: ; 02:4d6e +Function8d6e: ld hl, wcb61 ld e, [hl] ld d, $00 @@ -1762,13 +1762,13 @@ Function8d6e: ; 02:4d6e ld l, a jp hl -Table8d7d: ; 02:4d7d +Table8d7d: dw Function8d85 dw Function8d91 dw Function8d85 dw Function8db9 -Function8d85: ; 02:4d85 +Function8d85: ld hl, hJoyDown ld a, [hl] and $01 @@ -1777,7 +1777,7 @@ Function8d85: ; 02:4d85 inc [hl] ret -Function8d91: ; 02:4d91 +Function8d91: ld hl, $000c add hl, bc ld a, [hl] @@ -1803,7 +1803,7 @@ Function8d91: ; 02:4d91 ld [wcb61], a ret -Function8db9: ; 02:4db9 +Function8db9: ld hl, $000c add hl, bc ld a, [hl] @@ -1829,7 +1829,7 @@ Function8db9: ; 02:4db9 ld [wcb61], a ret -Function8de3: ; 02:4de3 +Function8de3: push hl ld hl, $0006 add hl, bc @@ -1849,7 +1849,7 @@ Function8de3: ; 02:4de3 ld [hl], d ret -Function8dfd: ; 02:4dfd +Function8dfd: ld hl, $0006 add hl, bc push bc @@ -1887,12 +1887,12 @@ Function8dfd: ; 02:4dfd ld l, a jp hl -Function8e2c: ; 02:4e2c +Function8e2c: pop bc scf ret -Table8e2f: ; 02:4e2f +Table8e2f: dw Data8e4d dw Data8e4d dw Data8e4d @@ -1909,7 +1909,7 @@ Table8e2f: ; 02:4e2f dw Data8e4d dw Data8e4d -Data8e4d: ; 02:4e4d +Data8e4d: db $10, $02 dw Function8e66 dw Function8e66 @@ -1928,12 +1928,12 @@ Data8e4d: ; 02:4e4d db $00 -Function8e66: ; 02:4e66 +Function8e66: ld d, $00 call PlayMusic ret -Function8e6c: ; 02:4e6c +Function8e6c: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1948,14 +1948,14 @@ Function8e6c: ; 02:4e6c call WaitBGMap ret -Text8e90: ; 02:4e90 +Text8e90: db "けんがい@" -Text8e95: ; 02:4e95 +Text8e95: text "ちぇっ⋯⋯⋯⋯" done -Function8e9e: ; 02:4e9e +Function8e9e: ld hl, hJoyDown ld a, [hl] and $02 @@ -1964,7 +1964,7 @@ Function8e9e: ; 02:4e9e ld [wJumptableIndex], a ret -Function8eaa: ; 02:4eaa +Function8eaa: ld hl, InitEffectObject ld a, BANK(InitEffectObject) call FarCall_hl @@ -1978,7 +1978,7 @@ Function8eaa: ; 02:4eaa call WaitBGMap ret -Function8eca: ; 02:4eca +Function8eca: ld hl, wFlyDestination ld de, hJoySum ld a, [de] @@ -2010,10 +2010,10 @@ Function8eca: ; 02:4eca ld [hl], a ret -Data8ef5: ; 02:4ef5 +Data8ef5: db $00, $18, $30, $00 -Function8ef9: ; 02:4ef9 +Function8ef9: dec c dec c dec b @@ -2063,11 +2063,11 @@ Function8ef9: ; 02:4ef9 SECTION "engine/dumps/bank02.asm@Text91c2", ROMX -Text91c2: ; 02:51c2 +Text91c2: text "エーボタンで チューニング！" done -SetTitleBGDecorationBorder: ; 02:51d2 +SetTitleBGDecorationBorder: ld de, TitleBGDecorationBorder ld hl, vChars2 + $500 lb bc, BANK(TitleBGDecorationBorder), $09 @@ -2080,7 +2080,7 @@ SetTitleBGDecorationBorder: ; 02:51d2 call Function91ef ret -Function91ef: ; 02:51ef +Function91ef: xor a ld c, $14 .sub_91f2 @@ -2094,7 +2094,7 @@ Function91ef: ; 02:51ef SECTION "engine/dumps/bank02.asm@Function928b", ROMX -Function928b: ; 02:528b +Function928b: ld a, b cp $ff jr nz, .sub_9293 @@ -2114,7 +2114,7 @@ Function928b: ; 02:528b push de jp hl -Table92a8: ; 02:52a8 +Table92a8: dw Function92d4 dw Function92db dw Function934b @@ -2138,12 +2138,12 @@ Table92a8: ; 02:52a8 dw Function94ab dw Function94c8 -Function92d4: ; 02:52d4 +Function92d4: ld hl, Data99ec ld de, Data988c ret -Function92db: ; 02:52db +Function92db: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2184,7 +2184,7 @@ Function92db: ; 02:52db ld [wccd0], a ret -Function932b: ; 02:532b +Function932b: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2200,12 +2200,12 @@ Function932b: ; 02:532b ld de, Data98bc ret -Function934b: ; 02:534b +Function934b: ld hl, Data99fc ld de, Data986c ret -Function9352: ; 02:5352 +Function9352: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2225,12 +2225,12 @@ Function9352: ; 02:5352 ld de, Data98ac ret -Function937b: ; 02:537b +Function937b: ld hl, Data99dc ld de, wcce2 ret -Function9382: ; 02:5382 +Function9382: ld hl, Data9a0c ld de, wcce1 ld bc, $0010 @@ -2243,27 +2243,27 @@ Function9382: ; 02:5382 ld de, Data98cc ret -Function939f: ; 02:539f +Function939f: ld hl, Data99bc ld de, Data986c ret -Function93a6: ; 02:53a6 +Function93a6: ld hl, Data9a1c ld de, Data98dc ret -Function93ad: ; 02:53ad +Function93ad: ld hl, Data9a2c ld de, Data993c ret -Function93b4: ; 02:53b4 +Function93b4: ld hl, Data9a3c ld de, Data986c ret -Function93bb: ; 02:53bb +Function93bb: ld b, $00 ld hl, Table93cc add hl, bc @@ -2279,7 +2279,7 @@ Function93bb: ; 02:53bb ld l, a ret -Table93cc: ; 02:53cc +Table93cc: dw Data986c dw Data996c @@ -2289,19 +2289,19 @@ Table93cc: ; 02:53cc dw Data986c dw Data999c -Function93d8: ; 02:53d8 +Function93d8: ld hl, Data9a4c ld de, Data986c ld a, $08 ld [wccd0], a ret -Function93e4: ; 02:53e4 +Function93e4: ld hl, Data99cc ld de, Data986c ret -Function93eb: ; 02:53eb +Function93eb: ld hl, Data986c ld de, wc51a ld bc, $0010 @@ -2310,7 +2310,7 @@ Function93eb: ; 02:53eb ld de, Data986c ret -Function93fe: ; 02:53fe +Function93fe: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2323,7 +2323,7 @@ Function93fe: ; 02:53fe ld [wccd0], a ret -Function941a: ; 02:541a +Function941a: push bc ld hl, Data995c ld de, wcce1 @@ -2343,12 +2343,12 @@ Function941a: ; 02:541a ld de, Data986c ret -Function9441: ; 02:5441 +Function9441: ld hl, Data9a3c ld de, Data986c ret -Function9448: ; 02:5448 +Function9448: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2379,7 +2379,7 @@ Function9448: ; 02:5448 ld de, wccf1 ret -Function948e: ; 02:548e +Function948e: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2392,7 +2392,7 @@ Function948e: ; 02:548e ld de, Data992c ret -Function94ab: ; 02:54ab +Function94ab: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2405,7 +2405,7 @@ Function94ab: ; 02:54ab ld de, Data992c ret -Function94c8: ; 02:54c8 +Function94c8: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2418,7 +2418,7 @@ Function94c8: ; 02:54c8 ld de, Data992c ret -Function94e5: ; 02:54e5 +Function94e5: ld a, [wMapPermissions] cp $02 jr z, .sub_950e @@ -2459,7 +2459,7 @@ Function94e5: ; 02:54e5 ld a, $0d ret -Function9527: ; 02:5527 +Function9527: ld a, [wTimeOfDay] and $03 jr z, .sub_9534 @@ -2471,7 +2471,7 @@ Function9527: ; 02:5527 and a ret -Function9536: ; 02:5536 +Function9536: ld a, [wTimeOfDay] and $03 cp $02 @@ -2482,7 +2482,7 @@ Function9536: ; 02:5536 and a ret -Function9543: ; 02:5543 +Function9543: ld a, [wMapGroup] ld e, a ld d, $00 @@ -2491,23 +2491,23 @@ Function9543: ; 02:5543 ld a, [hl] ret -Data954f: ; 02:554f +Data954f: db $01, $07, $0c, $03, $08, $06, $0b, $04 db $05, $0a, $02, $03, $02, $02, $09, $01 -Function955f: ; 02:555f +Function955f: push de call Function964b pop hl jp Function964b -Function9567: ; 02:5567 +Function9567: bit 3, a ld a, $18 ret nz ld a, [hl] -Function956d: ; 02:556d +Function956d: and a jr z, .sub_957a ld e, a @@ -2522,7 +2522,7 @@ Function956d: ; 02:556d scf ret -Function957e: ; 02:557e +Function957e: push bc push af ld hl, wPartyMon1DVs @@ -2539,7 +2539,7 @@ Function957e: ; 02:557e pop bc ret -Function9599: ; 02:5599 +Function9599: push bc push af ld a, e @@ -2558,7 +2558,7 @@ Function9599: ; 02:5599 pop bc ret -Function95b0: ; 02:55b0 +Function95b0: ld a, [hl] cp $a0 jr c, .sub_95ca @@ -2579,7 +2579,7 @@ Function95b0: ; 02:55b0 and a ret -Function95cc: ; 02:55cc +Function95cc: ld hl, wcddf ldh a, [hBattleTurn] and a @@ -2608,13 +2608,13 @@ Function95cc: ; 02:55cc .sub_95f7 ret -Function95f8: ; 02:55f8 +Function95f8: ld hl, Data98fc ld de, wcce2 ld bc, $0030 jp CopyBytes -Function9604: ; 02:5604 +Function9604: ld hl, wccd3 ld a, [wcce1] ld e, a @@ -2640,27 +2640,27 @@ Function9604: ; 02:5604 ld [hl], e ret -Function962d: ; 02:562d +Function962d: ld hl, Data997c jp Function964b -Function9633: ; 02:5633 +Function9633: ld hl, Data986c jp Function964b -Function9639: ; 02:5639 +Function9639: ld hl, Data99ac jp Function964b -Function963f: ; 02:563f +Function963f: ld hl, Data99bc jp Function964b -Function9645: ; 02:5645 +Function9645: ld hl, wc51a jp Function964b -Function964b: ; 02:564b +Function964b: ld a, [wJoypadFlags] push af set 7, a @@ -2670,7 +2670,7 @@ Function964b: ; 02:564b ld [wJoypadFlags], a ret -Function965c: ; 02:565c +Function965c: ld a, [hl] and $07 ret z @@ -2710,7 +2710,7 @@ Function965c: ; 02:565c jr nz, .sub_9661 ret -CheckSGB: ; 02:5695 +CheckSGB: ld a, [wJoypadFlags] push af set 7, a @@ -2749,7 +2749,7 @@ CheckSGB: ; 02:5695 jr nz, .sub_96ca ret -Table96d9: ; 02:56d9 +Table96d9: dw Data9aac dw Data9acc dw Data9adc @@ -2760,7 +2760,7 @@ Table96d9: ; 02:56d9 dw Data9b2c dw Data9b3c -Function96eb: ; 02:56eb +Function96eb: ld a, [wSGB] ret z di @@ -2774,7 +2774,7 @@ Function96eb: ; 02:56eb ei ret -Function9704: ; 02:5704 +Function9704: call Function9710 push de call Function980a @@ -2782,7 +2782,7 @@ Function9704: ; 02:5704 call Function97be ret -Function9710: ; 02:5710 +Function9710: ld a, [wce5f] bit 3, a jr nz, .sub_971e @@ -2794,14 +2794,14 @@ Function9710: ; 02:5710 ld de, Corrupteda66cGFX ret -Function9725: ; 02:5725 +Function9725: ld hl, vChars0 ld bc, $2000 xor a call ByteFill ret -Function9730: ; 02:5730 +Function9730: ld hl, Data9a7c call Function965c call Function9860 @@ -2852,7 +2852,7 @@ Function9730: ; 02:5730 call Function965c jp Function9860 -Function979a: ; 02:579a +Function979a: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2869,7 +2869,7 @@ Function979a: ; 02:579a ldh [rBGP], a ret -Function97be: ; 02:57be +Function97be: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2903,7 +2903,7 @@ Function97be: ; 02:57be ldh [rBGP], a ret -Function980a: ; 02:580a +Function980a: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2927,7 +2927,7 @@ Function980a: ; 02:580a ldh [rBGP], a ret -Function9838: ; 02:5838 +Function9838: ld a, [hli] ld [de], a inc de @@ -2937,7 +2937,7 @@ Function9838: ; 02:5838 jr nz, Function9838 ret -Function9841: ; 02:5841 +Function9841: xor a ld [de], a inc de @@ -2947,7 +2947,7 @@ Function9841: ; 02:5841 jr nz, Function9841 ret -Function984a: ; 02:584a +Function984a: ld hl, vBGMap0 ld de, $000c ld a, $80 @@ -2964,7 +2964,7 @@ Function984a: ; 02:584a jr nz, .sub_9854 ret -Function9860: ; 02:5860 +Function9860: ld de, $1b58 .sub_9863 nop @@ -2976,186 +2976,186 @@ Function9860: ; 02:5860 jr nz, .sub_9863 ret -Data986c: ; 02:586c +Data986c: db $21, $01, $03, $00, $00, $00, $13, $11 db $00, $00, $00, $00, $00, $00, $00, $00 -Data987c: ; 02:587c +Data987c: db $21, $01, $07, $05, $00, $0a, $13, $0d db $00, $00, $00, $00, $00, $00, $00, $00 -Data988c: ; 02:588c +Data988c: db $22, $05, $07, $0a, $00, $0c, $13, $11 db $03, $05, $01, $00, $0a, $03, $03, $00 -Data989c: ; 02:589c +Data989c: db $0a, $08, $13, $0a, $03, $0a, $00, $04 db $08, $0b, $03, $0f, $0b, $00, $13, $07 -Data98ac: ; 02:58ac +Data98ac: db $21, $01, $07, $05, $00, $01, $07, $07 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98bc: ; 02:58bc +Data98bc: db $21, $01, $07, $05, $0b, $01, $13, $02 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98cc: ; 02:58cc +Data98cc: db $21, $01, $07, $05, $01, $01, $08, $08 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98dc: ; 02:58dc +Data98dc: db $22, $05, $03, $05, $00, $00, $13, $0b db $03, $0a, $00, $04, $13, $09, $02, $0f -Data98ec: ; 02:58ec +Data98ec: db $00, $06, $13, $07, $03, $00, $04, $04 db $0f, $09, $03, $00, $00, $0c, $13, $11 -Data98fc: ; 02:58fc +Data98fc: db $23, $07, $07, $10, $00, $00, $02, $0c db $02, $00, $0c, $00, $12, $01, $02, $00 -Data990c: ; 02:590c +Data990c: db $0c, $02, $12, $03, $02, $00, $0c, $04 db $12, $05, $02, $00, $0c, $06, $12, $07 -Data991c: ; 02:591c +Data991c: db $02, $00, $0c, $08, $12, $09, $02, $00 db $0c, $0a, $12, $0b, $00, $00, $00, $00 -Data992c: ; 02:592c +Data992c: db $21, $01, $07, $10, $00, $00, $13, $02 db $00, $00, $00, $00, $00, $00, $00, $00 -Data993c: ; 02:593c +Data993c: db $21, $01, $07, $10, $00, $00, $13, $05 db $00, $00, $00, $00, $00, $00, $00, $00 -Data994c: ; 02:594c +Data994c: db $51, $35, $00, $36, $00, $37, $00, $38 db $00, $00, $00, $00, $00, $00, $00, $00 -Data995c: ; 02:595c +Data995c: db $51, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data996c: ; 02:596c +Data996c: db $51, $2a, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data997c: ; 02:597c +Data997c: db $51, $2b, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data998c: ; 02:598c +Data998c: db $51, $2c, $00, $2d, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data999c: ; 02:599c +Data999c: db $51, $2e, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99ac: ; 02:59ac +Data99ac: db $51, $2f, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99bc: ; 02:59bc +Data99bc: db $51, $30, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99cc: ; 02:59cc +Data99cc: db $51, $2d, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99dc: ; 02:59dc +Data99dc: db $51, $22, $00, $23, $00, $24, $00, $25 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99ec: ; 02:59ec +Data99ec: db $51, $0e, $00, $0e, $00, $0e, $00, $0e db $00, $00, $00, $00, $00, $00, $00, $00 -Data99fc: ; 02:59fc +Data99fc: db $51, $26, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a0c: ; 02:5a0c +Data9a0c: db $51, $30, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a1c: ; 02:5a1c +Data9a1c: db $51, $31, $00, $32, $00, $33, $00, $34 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a2c: ; 02:5a2c +Data9a2c: db $51, $27, $00, $28, $00, $0f, $00, $13 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a3c: ; 02:5a3c +Data9a3c: db $51, $0f, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a4c: ; 02:5a4c +Data9a4c: db $51, $29, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a5c: ; 02:5a5c +Data9a5c: db $59, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a6c: ; 02:5a6c +Data9a6c: db $89, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a7c: ; 02:5a7c +Data9a7c: db $89, $01, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a8c: ; 02:5a8c +Data9a8c: db $99, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a9c: ; 02:5a9c +Data9a9c: db $a1, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9aac: ; 02:5aac +Data9aac: db $b9, $01, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9abc: ; 02:5abc +Data9abc: db $b9, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9acc: ; 02:5acc +Data9acc: db $79, $5d, $08, $00, $0b, $8c, $d0, $f4 db $60, $00, $00, $00, $00, $00, $00, $00 -Data9adc: ; 02:5adc +Data9adc: db $79, $52, $08, $00, $0b, $a9, $e7, $9f db $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0 -Data9aec: ; 02:5aec +Data9aec: db $79, $47, $08, $00, $0b, $c4, $d0, $16 db $a5, $cb, $c9, $05, $d0, $10, $a2, $28 -Data9afc: ; 02:5afc +Data9afc: db $79, $3c, $08, $00, $0b, $f0, $12, $a5 db $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9 -Data9b0c: ; 02:5b0c +Data9b0c: db $79, $31, $08, $00, $0b, $0c, $a5, $ca db $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e -Data9b1c: ; 02:5b1c +Data9b1c: db $79, $26, $08, $00, $0b, $39, $cd, $48 db $0c, $d0, $34, $a5, $c9, $c9, $80, $d0 -Data9b2c: ; 02:5b2c +Data9b2c: db $79, $1b, $08, $00, $0b, $ea, $ea, $ea db $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 -Data9b3c: ; 02:5b3c +Data9b3c: db $79, $10, $08, $00, $0b, $4c, $20, $08 db $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 456c903..bef8017 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank03.asm@Functionc77d", ROMX -Functionc77d: ; 03:477d +Functionc77d: ld a, [wFlyDestination] ld l, a ld h, $00 @@ -21,7 +21,7 @@ Functionc77d: ; 03:477d SECTION "engine/dumps/bank03.asm@SpawnPoints", ROMX ; Map, Warp ID -SpawnPoints: ; 03:47d5 +SpawnPoints: db $01, $04 db $05, $05 db $02, $02 @@ -120,7 +120,7 @@ SpawnPoints: ; 03:47d5 SECTION "engine/dumps/bank03.asm@Functionc9c1", ROMX -Functionc9c1: ; 03:49c1 +Functionc9c1: xor a ld bc, $0020 ld hl, wCurrMapInlineTrainers @@ -155,7 +155,7 @@ Functionc9c1: ; 03:49c1 .sub_c9f5 jp CheckInlineTrainer -Functionc9f8: ; 03:49f8 +Functionc9f8: ld a, [wItemQuantity] push af push bc @@ -239,7 +239,7 @@ Functionc9f8: ; 03:49f8 ld [wItemQuantity], a ret -Functionca68: ; 03:4a68 +Functionca68: push hl inc hl ld a, [wItemIndex] @@ -285,7 +285,7 @@ Functionca68: ; 03:4a68 SECTION "engine/dumps/bank03.asm@Functiond41d", ROMX -Functiond41d: ; 03:541d +Functiond41d: push hl call Functiond4b2 ld a, [wItemAttributeParamBuffer] @@ -321,24 +321,24 @@ Functiond41d: ; 03:541d scf ret -Textd46b: ; 03:546b +Textd46b: text_from_ram wStringBuffer1 text "を" line "すてました！" prompt -Textd478: ; 03:5478 +Textd478: text_from_ram wStringBuffer2 text "を すてます" line "ほんとに よろしいですか？" prompt -Textd491: ; 03:5491 +Textd491: text "それは とても たいせつなモノです" line "すてることは できません！" prompt -Functiond4b2: ; 03:54b2 +Functiond4b2: push hl push bc ld a, $01 @@ -372,7 +372,7 @@ Functiond4b2: ; 03:54b2 pop hl ret -Functiond4e6: ; 03:54e6 +Functiond4e6: ld a, [wcb6e] and a ret z @@ -386,13 +386,13 @@ Functiond4e6: ; 03:54e6 .sub_d4f8 jr Functiond505 -Functiond4fa: ; 03:54fa +Functiond4fa: call Functiond51e ld hl, Function8261 ld a, BANK(Function8261) call FarCall_hl -Functiond505: ; 03:5505 +Functiond505: ld a, $04 ld [wcdb2], a ldh a, [hOverworldFlashlightEffect] @@ -404,11 +404,11 @@ Functiond505: ; 03:5505 call Functiond708 jr Functiond543 -Functiond519: ; 03:5519 +Functiond519: call Functiond51e jr Functiond543 -Functiond51e: ; 03:551e +Functiond51e: ld a, [wPlayerStepDirection] and a jr nz, .sub_d529 @@ -434,7 +434,7 @@ Functiond51e: ; 03:551e inc [hl] ret -Functiond543: ; 03:5543 +Functiond543: call .sub_d5bf ld a, [wcb6c] ld d, a @@ -531,7 +531,7 @@ Functiond543: ; 03:5543 ld l, a jp hl -Tabled5d3: ; 03:55d3 +Tabled5d3: dw RefreshTiles dw Functiond5ea dw BufferScreen @@ -544,16 +544,16 @@ Tabled5d3: ; 03:55d3 dw Functiond5e9 dw Functiond5e9 -Functiond5e9: ; 03:55e9 +Functiond5e9: ret -Functiond5ea: ; 03:55ea +Functiond5ea: ld hl, Functionc9c1 ld a, BANK(Functionc9c1) call FarCall_hl ret -Functiond5f3: ; 03:55f3 +Functiond5f3: ld a, [wPlayerStepDirection] and a jr z, .sub_d606 @@ -585,7 +585,7 @@ Functiond5f3: ; 03:55f3 call ScheduleEastColumnRedraw ret -Functiond62e: ; 03:562e +Functiond62e: ld a, [wBGMapAnchor] add $40 ld [wBGMapAnchor], a @@ -615,7 +615,7 @@ Functiond62e: ; 03:562e inc [hl] ret -Functiond65f: ; 03:565f +Functiond65f: ld a, [wBGMapAnchor] sub $40 ld [wBGMapAnchor], a @@ -647,7 +647,7 @@ Functiond65f: ; 03:565f dec [hl] ret -Functiond692: ; 03:5692 +Functiond692: ld a, [wBGMapAnchor] ld e, a and $e0 @@ -675,7 +675,7 @@ Functiond692: ; 03:5692 dec [hl] ret -Functiond6bb: ; 03:56bb +Functiond6bb: ld a, [wBGMapAnchor] ld e, a and $e0 @@ -703,7 +703,7 @@ Functiond6bb: ; 03:56bb inc [hl] ret -Functiond6e4: ; 03:56e4 +Functiond6e4: ld a, [wcb6e] and a ret z @@ -723,7 +723,7 @@ Functiond6e4: ; 03:56e4 call Functiond51e jp Functiond543 -Functiond708: ; 03:5708 +Functiond708: ld a, [wPlayerStepDirection] and a jr z, .sub_d71b @@ -814,7 +814,7 @@ Functiond708: ; 03:5708 ld [wRedrawFlashlightBlackDst1+1], a ret -Datad7b1: ; 03:57b1 +Datad7b1: db $02, $03, $02, $11, $02, $02, $02, $10 db $02, $0e, $02, $00, $02, $0f, $02, $01 db $03, $02, $11, $02, $02, $02, $10, $02 @@ -832,7 +832,7 @@ Datad7b1: ; 03:57b1 db $09, $08, $0b, $08, $08, $08, $0a, $08 db $08, $08, $06, $08, $09, $08, $07, $08 -Functiond831: ; 03:5831 +Functiond831: ld c, [hl] inc hl ld b, [hl] @@ -871,7 +871,7 @@ Functiond831: ; 03:5831 pop hl ret -Functiond85f: ; 03:585f +Functiond85f: push hl ld hl, wTileMap ld de, $0014 @@ -889,7 +889,7 @@ Functiond85f: ; 03:585f pop hl ret -Functiond873: ; 03:5873 +Functiond873: ldh a, [hOverworldFlashlightEffect] dec a ld l, a @@ -900,10 +900,10 @@ Functiond873: ; 03:5873 ld [wRedrawFlashlightWidthHeight], a ret -Datad882: ; 03:5882 +Datad882: db $07, $05, $03, $01 -Functiond886: ; 03:5886 +Functiond886: ld de, wPartyCount ld a, [wMonType] and $0f @@ -933,7 +933,7 @@ Functiond886: ; 03:5886 jr z, Functiond8b6 ld hl, wOTPartyMonOT -Functiond8b6: ; 03:58b6 +Functiond8b6: ldh a, [hMoveMon] dec a call SkipNames @@ -1160,7 +1160,7 @@ Functiond8b6: ; 03:58b6 scf ret -FillPP: ; 03:5a28 +FillPP: ld b, $04 .sub_da2a ld a, [hli] @@ -1188,7 +1188,7 @@ FillPP: ; 03:5a28 ret -Functionda4f: ; 03:5a4f +Functionda4f: ld hl, wPartyCount ld a, [hl] cp $06 @@ -1247,7 +1247,7 @@ Functionda4f: ; 03:5a4f and a ret -Functiondac8: ; 03:5ac8 +Functiondac8: ld a, [wcd7c] and a jr z, .sub_dae3 @@ -1426,7 +1426,7 @@ Functiondac8: ; 03:5ac8 and a ret -Functiondc16: ; 03:5c16 +Functiondc16: ld hl, wPartyCount ld a, [hl] cp $06 @@ -1554,7 +1554,7 @@ Functiondc16: ; 03:5c16 and a ret -Functiondcfc: ; 03:5cfc +Functiondcfc: ld a, [wcd7c] ld de, wd876 and a @@ -1590,7 +1590,7 @@ Functiondcfc: ; 03:5cfc ld bc, $0020 jp CopyBytes -Functiondd5c: ; 03:5d5c +Functiondd5c: ld de, wBoxListLength ld a, [de] cp $1e @@ -1765,7 +1765,7 @@ Functiondd5c: ; 03:5d5c scf ret -Functionde79: ; 03:5e79 +Functionde79: ld a, [wPartyCount] cp $06 jr z, .sub_de8b @@ -1812,7 +1812,7 @@ Functionde79: ; 03:5e79 and a ret -Functiondecd: ; 03:5ecd +Functiondecd: ld hl, wPartyCount ld a, [wcd7c] and a @@ -1908,7 +1908,7 @@ Functiondecd: ; 03:5ecd .sub_df7a jp CopyDataUntil -Functiondf7d: ; 03:5f7d +Functiondf7d: ld c, $00 .sub_df7f inc c @@ -1924,7 +1924,7 @@ Functiondf7d: ; 03:5f7d jr nz, .sub_df7f ret -Functiondf91: ; 03:5f91 +Functiondf91: push hl push de push bc @@ -2111,7 +2111,7 @@ Functiondf91: ; 03:5f91 pop hl ret -Function60a0: ; 03:60a0 +Function60a0: ld a, [wMonDexIndex] dec a ld c, a @@ -2211,36 +2211,36 @@ Function60a0: ; 03:60a0 ld b, $02 ret -Texte168: ; 03:6168 +Texte168: text_from_ram wStringBuffer1 text "は マサキの ところへ" line "てんそうされた！" prompt -Texte181: ; 03:6181 +Texte181: text_from_ram wStringBuffer1 text "は だれかの <PC>に" line "てんそうされた！" prompt -Texte198: ; 03:6198 +Texte198: text_from_ram wStringBuffer1 text "の データが あたらしく" line "#ずかんに セーブされます！@" -Texte1b8: ; 03:61b8 +Texte1b8: db "ドギ@" -Texte1bb: ; 03:61bb +Texte1bb: text "ゲットした @" -Texte1c3: ; 03:61c3 +Texte1c3: text_from_ram wStringBuffer1 text "に" line "なまえを つけますか？" done -Functione1d5: ; 03:61d5 +Functione1d5: call Functione284 ret c call LoadStandardMenuHeader @@ -2273,40 +2273,40 @@ Functione1d5: ; 03:61d5 call CloseWindow ret -Texte224: ; 03:6224 +Texte224: text "なんに するん？" done -Datae22e: ; 03:622e +Datae22e: db $40, $00, $00, $11, $0e dw Datae236 db $01 -Datae236: ; 03:6236 +Datae236: db $80, $00 dw Datae27c db $8a, $1f dw Texte23e -Texte23e: ; 03:623e +Texte23e: db "#の ようすをみる@" -Texte248: ; 03:6248 +Texte248: db "#を つれていく@" -Texte251: ; 03:6251 +Texte251: db "#を あずける@" -Texte259: ; 03:6259 +Texte259: db "#を にがす@" -Texte260: ; 03:6260 +Texte260: db "ボックスを かえる@" -Texte26a: ; 03:626a +Texte26a: db "さようなら@" -Tablee270: ; 03:6270 +Tablee270: dw Functione5c5 dw Functione31b dw Functione2a6 @@ -2314,10 +2314,10 @@ Tablee270: ; 03:6270 dw Functione3c3 dw Functione2a4 -Datae27c: ; 03:627c +Datae27c: db $05, $00, $01, $02, $03, $04, $05, $ff -Functione284: ; 03:6284 +Functione284: ld a, [wPartyCount] and a ret nz @@ -2326,16 +2326,16 @@ Functione284: ; 03:6284 scf ret -Texte291: ; 03:6291 +Texte291: text "#もってへんやつは" line "おことわりや！" prompt -Functione2a4: ; 03:62a4 +Functione2a4: scf ret -Functione2a6: ; 03:62a6 +Functione2a6: call Functione2b0 jr c, .sub_e2ae call Functione2f0 @@ -2343,7 +2343,7 @@ Functione2a6: ; 03:62a6 and a ret -Functione2b0: ; 03:72b0 +Functione2b0: ld a, [wPartyCount] and a jr z, .sub_e2bc @@ -2362,16 +2362,16 @@ Functione2b0: ; 03:72b0 scf ret -Texte2cc: ; 03:62cc +Texte2cc: text "１ぴきも もってへんやんか！" prompt -Texte2dc: ; 03:62dc +Texte2dc: text "それ あずけたら" line "こまるんとちゃう？" prompt -Functione2f0: ; 03:62f0 +Functione2f0: call LoadStandardMenuHeader ld hl, Tablee6da call Functione6a4 @@ -2390,7 +2390,7 @@ Functione2f0: ; 03:62f0 call Functiondecd ret -Functione31b: ; 03:631b +Functione31b: call .sub_e325 jr c, .sub_e323 call Functione350 @@ -2409,12 +2409,12 @@ Functione31b: ; 03:631b scf ret -Texte336: ; 03:6336 +Texte336: text "それいじょう よくばったって" line "# もたれへんで！" prompt -Functione350: ; 03:6350 +Functione350: call LoadStandardMenuHeader ld hl, Datae6f8 call Functione6a4 @@ -2433,7 +2433,7 @@ Functione350: ; 03:6350 call Functiondecd ret -Functione37b: ; 03:637b +Functione37b: call .sub_e380 and a ret @@ -2457,18 +2457,18 @@ Functione37b: ; 03:637b call Functiondecd ret -Texte3af: ; 03:63af +Texte3af: text_from_ram wStringBuffer1 text " をほんとうに" next "にがしますか？" done -Functione3c3: ; 03:63c3 +Functione3c3: call Functione3c8 and a ret -Functione3c8: ; 03:63c8 +Functione3c8: call Functione3ed call LoadStandardMenuHeader call ClearPalettes @@ -2486,7 +2486,7 @@ Functione3c8: ; 03:63c8 call CloseWindow ret -Functione3ed: ; 03:63ed +Functione3ed: ld hl, wd4b9 ld c, $00 .sub_e3f2 @@ -2507,17 +2507,17 @@ Functione3ed: ; 03:63ed jr c, .sub_e3f2 ret -Texte40c: ; 03:640c +Texte40c: db "ダミーボックス@" -Datae414: ; 03:6414 +Datae414: db $40, $00, $00, $0c, $13, $1c, $64, $01 db $20, $04, $00, $01, $03, $2c, $64, $03 db $38, $64, $00, $00, $00, $03, $9d, $64 db $0a, $01, $02, $03, $04, $05, $06, $07 db $08, $09, $0a, $ff -Functione438: ; 03:6438 +Functione438: push de ld a, [wMenuSelection] dec a @@ -2540,7 +2540,7 @@ Functione438: ; 03:6438 call PlaceString ret -Texte461: ; 03:6461 +Texte461: db "・.０１ @" db "・.０２ @" db "・.０３ @" @@ -2552,7 +2552,7 @@ Texte461: ; 03:6461 db "・.０９ @" db "・.１０ @" -Functione49d: ; 03:649d +Functione49d: ld h, d ld l, e ld de, Texte4bf @@ -2570,14 +2570,14 @@ Functione49d: ; 03:649d call PlaceString ret -Texte4bf: ; 03:64bf +Texte4bf: db "あずかっている#" next " @" -Texte4ca: ; 03:64ca +Texte4ca: db "/３０@" -Functione4ce: ; 03:64ce +Functione4ce: ld a, [wMenuSelection] dec a ld c, a @@ -2595,7 +2595,7 @@ Functione4ce: ; 03:64ce call CloseSRAM ret -Datae4e7: ; 03:64e7 +Datae4e7: db $02, $00, $a0 db $02, $48, $a5 db $02, $90, $aa @@ -2607,7 +2607,7 @@ Datae4e7: ; 03:64e7 db $03, $d8, $af db $03, $20, $b5 -Functione505: ; 03:6505 +Functione505: ld hl, Datae5a5 call LoadMenuHeader call VerticalMenu @@ -2621,18 +2621,18 @@ Functione505: ; 03:6505 and a ret -Functione51f: ; 03:651f +Functione51f: ld hl, Texte529 call MenuTextBox call CloseWindow ret -Texte529: ; 03:6529 +Texte529: text "バンクチェンジは" next "かいはつちゅうです！" prompt -Functione53e: ; 03:653e +Functione53e: ld hl, Texte551 call MenuTextBox call YesNoBox @@ -2640,17 +2640,17 @@ Functione53e: ; 03:653e ret c jr Functione51f -Functione54d: ; 03:654d +Functione54d: ld a, [wMenuSelection] ret -Texte551: ; 03:6551 +Texte551: text "# ボックスを かえると" line "どうじに レポートが かかれます" para "<⋯⋯> それでも いいですか？" done -Functione57e: ; 03:657e +Functione57e: ld b, $04 ld de, wMovementBufferCount ld a, BANK(NamingScreen) @@ -2668,18 +2668,18 @@ Functione57e: ; 03:657e call CopyString ret -Datae5a5: ; 03:65a5 +Datae5a5: db $40, $06, $00, $0e, $0e dw Datae5ad db $01 -Datae5ad: ; 03:65ad +Datae5ad: db $80, $03 db "ボックスきりかえ@" db "なまえを かえる@" db "やめる@" -Functione5c5: ; 03:65c5 +Functione5c5: call LoadStandardMenuHeader call Functione5d3 call ClearPalettes @@ -2687,7 +2687,7 @@ Functione5c5: ; 03:65c5 and a ret -Functione5d3: ; 03:65d3 +Functione5d3: call ClearBGPalettes call .sub_e62a call SetPalettes @@ -2763,17 +2763,17 @@ Functione5d3: ; 03:65d3 ld [wce5f], a ret -Texte679: ; 03:6679 +Texte679: db "ボックス/いまの ボックス@" -Texte687: ; 03:6687 +Texte687: db "しゅるい なまえ レべル@" -Texte697: ; 03:6697 +Texte697: text "どの#が みたいねん？" done -Functione6a4: ; 03:66a4 +Functione6a4: ld a, l ld [wcd70], a ld a, h @@ -2798,52 +2798,52 @@ Functione6a4: ; 03:66a4 scf ret -Texte6d0: ; 03:66d0 +Texte6d0: text "#を えらんだ！" prompt -Tablee6da: ; 03:66da +Tablee6da: dw Datae6e0 dw wcd3c dw wcd46 -Datae6e0: ; 03:66e0 +Datae6e0: db $40, $03, $05, $0b, $12 dw Datae6e8 db $01 -Datae6e8: ; 03:e6e8 +Datae6e8: db $00, $04 -Datae6ea: ; 03:66ea +Datae6ea: db $08, $01, $00, $aa, $d6, $09, $a6 db $47, $09, $ba, $47, $00, $00, $00 -Datae6f8: ; 03:66f8 +Datae6f8: dw Datae6fe dw wcd3c dw wcd46 -Datae6fe: ; 03:66fe +Datae6fe: db $40, $03, $05, $0b, $12 dw Datae706 db $01 -Datae706: ; 03:6706 +Datae706: db $00, $04, $08, $01, $00, $83, $da, $09 db $ab, $47, $09, $c1, $47, $00, $00, $00 -Datae716: ; 03:6716 +Datae716: dw Datae71c dw wcd3c dw wcd46 -Datae71c: ; 03:671c +Datae71c: db $40, $04, $01, $0b, $13, $24, $67, $01 db $00, $04, $00, $01, $00, $83, $da, $09 db $d8, $47, $00, $00, $00, $00, $00, $00 -Function6734: ; 03:6734 +Function6734: call RefreshScreen call LowVolume ldh a, [hMapAnims] @@ -2875,7 +2875,7 @@ Function6734: ; 03:6734 call Function1fea ret -_UseItem: ; 03:677f +_UseItem: ld a, [wCurItem] ld [wce37], a call GetItemName @@ -2896,7 +2896,7 @@ _UseItem: ; 03:677f ld l, a jp hl -Tablee7a5: ; 03:67a5 +Tablee7a5: dw Functione8f9 dw Functione8f9 dw Functionf66f @@ -3068,7 +3068,7 @@ Tablee7a5: ; 03:67a5 dw Functionf672 dw Functionf672 -Functione8f9: ; 03:68f9 +Functione8f9: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -3394,81 +3394,81 @@ Functione8f9: ; 03:68f9 ld [wItemQuantity], a jp TossItem -Texteb6e: ; 03:6b6e +Texteb6e: text "よけられた！" line "こいつは つかまりそうにないぞ！" prompt -Texteb87: ; 03:6b87 +Texteb87: text "#に" line "うまく あたらなかった！" prompt -Texteb98: ; 03:6b98 +Texteb98: text "だめだ！ #が" line "ボールから でてしまった！" prompt -Textebaf: ; 03:6baf +Textebaf: text "ああ！" line "つかまえたと おもったのに！" prompt -Textebc3: ; 03:6bc3 +Textebc3: text "ざんねん！" line "もうすこしで つかまえられたのに！" prompt -Textebdc: ; 03:6bdc +Textebdc: text "おしい！" line "あと ちょっとの ところだったのに！" prompt -Textebf5: ; 03:6bf5 +Textebf5: text "やったー！" line "@" -Textebfd: ; 03:6bfd +Textebfd: text_from_ram wBattleMonNickname text "を つかまえたぞ！@" -Textec0b: ; 03:6c0b +Textec0b: sound_caught_mon text_waitbutton text_end -Textec0e: ; 03:6c0e +Textec0e: text_from_ram wdf17 text "は マサキの ところへ" line "てんそうされた！" prompt -Textec27: ; 03:6c27 +Textec27: text_from_ram wdf17 text "は だれかの <PC>に" line "てんそうされた！" prompt -Textec3e: ; 03:6c3e +Textec3e: text_from_ram wBattleMonNickname text "の データが あたらしく" line "#ずかんに セーブされます！@" -Textec5e: ; 03:6c5e +Textec5e: sound_slot_machine_start text_waitbutton text_end -Textec61: ; 03:6c61 +Textec61: text "つかまえた @" -Textec69: ; 03:6c69 +Textec69: text_from_ram wStringBuffer1 text "に" line "なまえを つけますか" done -Functionec7a: ; 03:6c7a +Functionec7a: call ClearPalettes ld hl, Function3e39f ld a, BANK(Function3e39f) @@ -3480,7 +3480,7 @@ Functionec7a: ; 03:6c7a call SetPalettes ret -Functionec95: ; 03:6c95 +Functionec95: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3488,7 +3488,7 @@ Functionec95: ; 03:6c95 ld hl, Function86a0 jp FarCall_hl -Functioneca4: ; 03:6ca4 +Functioneca4: xor a ld [wFieldMoveSucceeded], a call .sub_ecba @@ -3518,7 +3518,7 @@ Functioneca4: ; 03:6ca4 scf ret -Functionecd5: ; 03:6cd5 +Functionecd5: call RefreshScreen ld a, [wPlayerState] cp $01 @@ -3539,7 +3539,7 @@ Functionecd5: ; 03:6cd5 call Function1fea ret -Functioned00: ; 03:6d00 +Functioned00: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3567,7 +3567,7 @@ Functioned00: ; 03:6d00 ld [wFieldMoveSucceeded], a ret -Functioned37: ; 03:6d37 +Functioned37: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3616,13 +3616,13 @@ Functioned37: ; 03:6d37 call PrintText jp Functionf7a2 -Functioneda1: ; 03:6da1 +Functioneda1: pop hl ld hl, Textede7 call PrintText jp ClearPalettes -Functionedab: ; 03:6dab +Functionedab: push hl ld bc, $0024 add hl, bc @@ -3635,18 +3635,18 @@ Functionedab: ; 03:6dab ld a, $18 jp Predef -Functionedbe: ; 03:6dbe +Functionedbe: xor a ld [wFieldMoveSucceeded], a call ClearPalettes call z, GetMemSGBLayout jp ReloadFontAndTileset -Textedcb: ; 03:6dcb +Textedcb: text_from_ram wStringBuffer1 text "の @" -Textedd2: ; 03:6dd2 +Textedd2: text_from_ram wStringBuffer2 text "の" line "きそ ポイントが あがった！" @@ -3654,33 +3654,33 @@ Textedd2: ; 03:6dd2 -Textede7: ; 03:6de7 +Textede7: text "つかっても こうかが ないよ" prompt -Tableedf7: ; 03:6df7 +Tableedf7: dw Textee01 dw Textee07 dw Textee0f dw Textee17 dw Textee1c -Textee01: ; 03:6e01 +Textee01: db "たいりょく@" -Textee07: ; 03:6e07 +Textee07: db "こうげきりょく@" -Textee0f: ; 03:6e0f +Textee0f: db "ぼうぎょりょく@" -Textee17: ; 03:6e17 +Textee17: db "すばやさ@" -Textee1c: ; 03:6e1c +Textee1c: db "とくしゅのうりょく@" -Functionee26: ; 03:6e26 +Functionee26: ld a, [wCurItem] ld hl, Dataee38 .sub_ee2c @@ -3695,14 +3695,14 @@ Functionee26: ; 03:6e26 ld b, $00 ret -Dataee38: ; 03:6e38 +Dataee38: db $1a, $00 db $1b, $02 db $1c, $04 db $1d, $06 db $1f, $08 -Functionee42: ; 03:6e42 +Functionee42: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3804,7 +3804,7 @@ Functionee42: ; 03:6e42 call FarCall_hl jp Functionf7a2 -Functionef02: ; 03:6f02 +Functionef02: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3814,7 +3814,7 @@ Functionef02: ; 03:6f02 ld a, [wMonDexIndex] ld [wCurSpecies], a -Functionef17: ; 03:6f17 +Functionef17: call .sub_ef61 ld a, $20 call GetPartyParamLocation @@ -3866,7 +3866,7 @@ Functionef17: ; 03:6f17 pop hl ret -Dataef77: ; 03:6f77 +Dataef77: db $09, $f0, $08 db $0a, $f1, $10 db $0b, $f2, $20 @@ -3875,7 +3875,7 @@ Dataef77: ; 03:6f77 db $26, $f6, $ff db $ff, $00, $00 -Functionef8c: ; 03:6f8c +Functionef8c: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3921,10 +3921,10 @@ Functionef8c: ; 03:6f8c call Functionf7a2 jp Functionf104 -Functionefed: ; 03:6fed +Functionefed: ret -Functionefee: ; 03:6fee +Functionefee: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3974,10 +3974,10 @@ Functionefee: ; 03:6fee call Functionf7a2 jp Functionf104 -Functionf05a: ; 03:705a +Functionf05a: ret -Functionf05b: ; 03:705b +Functionf05b: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -4015,10 +4015,10 @@ Functionf05b: ; 03:705b call Functionf7a2 jp Functionf104 -Functionf0af: ; 03:70af +Functionf0af: ret -Functionf0b0: ; 03:70b0 +Functionf0b0: push de ld de, $0001 call WaitPlaySFX @@ -4033,13 +4033,13 @@ Functionf0b0: ; 03:70b0 call Predef ret -Functionf0cf: ; 03:70cf +Functionf0cf: ld [wcdb9], a ld a, $36 call Predef ret -Functionf0d8: ; 03:70d8 +Functionf0d8: xor a ldh [hBGMapMode], a ld hl, wTileMap @@ -4056,15 +4056,15 @@ Functionf0d8: ; 03:70d8 call TextboxWaitPressAorB_BlinkCursor ret -Functionf0fb: ; 03:70fb +Functionf0fb: call Functionf7e2 jr Functionf104 -Functionf100: ; 03:7100 +Functionf100: xor a ld [wFieldMoveSucceeded], a -Functionf104: ; 03:7104 +Functionf104: call ClearPalettes call z, GetMemSGBLayout ld a, [wBattleMode] @@ -4073,7 +4073,7 @@ Functionf104: ; 03:7104 call ReloadFontAndTileset ret -Functionf113: ; 03:7113 +Functionf113: ld a, [wBattleMode] and a ret z @@ -4089,16 +4089,16 @@ Functionf113: ; 03:7113 xor a ret -Functionf127: ; 03:7127 +Functionf127: call Functionf1c5 srl d rr e jr Functionf133 -Functionf130: ; 03:7130 +Functionf130: call Functionf1c5 -Functionf133: ; 03:7133 +Functionf133: ld a, $22 call GetPartyParamLocation ld [hl], d @@ -4107,7 +4107,7 @@ Functionf133: ; 03:7133 call Functionf17e ret -Functionf13f: ; 03:713f +Functionf13f: ld a, $23 call GetPartyParamLocation ld a, [hl] @@ -4134,7 +4134,7 @@ Functionf13f: ; 03:713f .sub_f164 ret -Functionf165: ; 03:7165 +Functionf165: call Functionf1b5 call Functionf19e call Functionf1ac @@ -4142,7 +4142,7 @@ Functionf165: ; 03:7165 or e ret -Functionf171: ; 03:7171 +Functionf171: call Functionf1ac ld h, d ld l, e @@ -4153,7 +4153,7 @@ Functionf171: ; 03:7171 sbc d ret -Functionf17e: ; 03:717e +Functionf17e: ld a, $22 call GetPartyParamLocation ld a, [hli] @@ -4162,21 +4162,21 @@ Functionf17e: ; 03:717e ld [wHPBarNewHP], a ret -Functionf18c: ; 03:718c +Functionf18c: ld a, d ld [wHPBarNewHP+1], a ld a, e ld [wHPBarNewHP], a ret -Functionf195: ; 03:7195 +Functionf195: ld a, [wHPBarNewHP+1] ld d, a ld a, [wHPBarNewHP] ld e, a ret -Functionf19e: ; 03:719e +Functionf19e: ld a, $22 call GetPartyParamLocation ld a, [hli] @@ -4185,14 +4185,14 @@ Functionf19e: ; 03:719e ld [wHPBarOldHP], a ret -Functionf1ac: ; 03:71ac +Functionf1ac: ld a, [wReplacementBlock] ld d, a ld a, [wHPBarOldHP] ld e, a ret -Functionf1b5: ; 03:71b5 +Functionf1b5: push hl ld a, $24 call GetPartyParamLocation @@ -4203,14 +4203,14 @@ Functionf1b5: ; 03:71b5 pop hl ret -Functionf1c5: ; 03:71c5 +Functionf1c5: ld a, [wMapBlocksAddress] ld d, a ld a, [wFieldMoveScriptID] ld e, a ret -Functionf1ce: ; 03:71ce +Functionf1ce: ld a, $24 call GetPartyParamLocation ld a, [hli] @@ -4227,7 +4227,7 @@ Functionf1ce: ; 03:71ce ld e, a ret -Functionf1e9: ; 03:71e9 +Functionf1e9: push hl ld a, [wCurItem] ld hl, Dataf203 @@ -4250,7 +4250,7 @@ Functionf1e9: ; 03:71e9 pop hl ret -Dataf203: ; 03:7203 +Dataf203: db $2e, $32, $00 db $2f, $3c, $00 db $30, $50, $00 @@ -4259,7 +4259,7 @@ Dataf203: ; 03:7203 db $12, $14, $00 db $ff, $00, $00 -Functionf218: ; 03:7218 +Functionf218: ld a, [wcd3c] dec a ld b, a @@ -4339,12 +4339,12 @@ Functionf218: ; 03:7218 pop bc jp .sub_f21d -Textf2a6: ; 03:72a6 +Textf2a6: text "その#には " line "つかえません" done -Functionf2b5: ; 03:72b5 +Functionf2b5: xor a ld [wFieldMoveSucceeded], a ld hl, DigFunction @@ -4352,18 +4352,18 @@ Functionf2b5: ; 03:72b5 call FarCall_hl ret -Functionf2c2: ; 03:72c2 +Functionf2c2: ld b, $c8 jp Functionf2ce -Functionf2c7: ; 03:72c7 +Functionf2c7: ld b, $fa jp Functionf2ce -Functionf2cc: ; 03:72cc +Functionf2cc: ld b, $64 -Functionf2ce: ; 03:72ce +Functionf2ce: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4371,7 +4371,7 @@ Functionf2ce: ; 03:72ce ld [wce2d], a jp Functionf793 -Functionf2dc: ; 03:72dc +Functionf2dc: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4379,7 +4379,7 @@ Functionf2dc: ; 03:72dc set 0, [hl] jp Functionf793 -Functionf2eb: ; 03:72eb +Functionf2eb: ld a, [wBattleMode] dec a jp nz, Functionf7dd @@ -4387,7 +4387,7 @@ Functionf2eb: ; 03:72eb ld [wce06], a jp Functionf793 -Functionf2fa: ; 03:72fa +Functionf2fa: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4395,7 +4395,7 @@ Functionf2fa: ; 03:72fa set 1, [hl] jp Functionf793 -Functionf309: ; 03:7309 +Functionf309: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4403,7 +4403,7 @@ Functionf309: ; 03:7309 set 2, [hl] jp Functionf793 -Functionf318: ; 03:7318 +Functionf318: ld a, [wBattleMode] and a jr nz, .sub_f327 @@ -4438,10 +4438,10 @@ Functionf318: ; 03:7318 ld [hl], a ret -Functionf354: ; 03:7354 +Functionf354: ret -Functionf355: ; 03:7355 +Functionf355: xor a ld [wMovementBufferCount], a ld b, $f8 @@ -4474,7 +4474,7 @@ Functionf355: ; 03:7355 ld hl, Textf3da jp PrintText -Functionf397: ; 03:7397 +Functionf397: ld de, $0030 ld c, $06 .sub_f39c @@ -4493,34 +4493,34 @@ Functionf397: ; 03:7397 jr nz, .sub_f39c ret -Dataf3af: ; 03:73af +Dataf3af: db $3e, $09 db $3d, $0a db $3f, $0a db $3e, $0b db $ff -Dataf3b8: ; 03:73b8 +Dataf3b8: db $0a, $1b db $0a, $19 db $ff -Textf3bd: ; 03:73bd +Textf3bd: text "#のふえを ふいた！" para "うーん！" line "すばらしい ねいろだ！" prompt -Textf3da: ; 03:73da +Textf3da: text "すべての #が" line "めを さました！" prompt -Textf3ec: ; 03:73ec +Textf3ec: text "<PLAYER>は" line "#のふえを ふいてみた！@" -Functionf3fd: ; 03:73fd +Functionf3fd: ld b, $08 ld a, [wBattleMode] and a @@ -4533,7 +4533,7 @@ Functionf3fd: ; 03:73fd .sub_f410 jp Function32d0 -Functionf413: ; 03:7413 +Functionf413: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4542,23 +4542,23 @@ Functionf413: ; 03:7413 call CloseWindow ret -Textf424: ; 03:7424 +Textf424: text "あなたの コイン" line "@" -Textf42f: ; 03:742f +Textf42f: deciram wd15b, 2, 4 text "まい" prompt -Functionf437: ; 03:7437 +Functionf437: call Functionf49f jp c, Functionf7dd ld bc, $0585 ld a, $01 jr Functionf478 -Functionf444: ; 03:7444 +Functionf444: call Functionf49f jp c, Functionf7dd .sub_f44a @@ -4583,16 +4583,16 @@ Functionf444: ; 03:7444 xor $01 jr Functionf478 -Dataf46a: ; 03:746a +Dataf46a: db $0a, $9d, $0a, $47 -Functionf46e: ; 03:746e +Functionf46e: call Functionf49f jp c, Functionf7dd call Functionf9d9 ld a, e -Functionf478: ; 03:7478 +Functionf478: ld [wMovementBufferCount], a dec a jr nz, .sub_f48b @@ -4616,7 +4616,7 @@ Functionf478: ; 03:7478 ld [hl], a ret -Functionf49f: ; 03:749f +Functionf49f: ld a, [wBattleMode] and a jr z, .sub_f4a7 @@ -4641,12 +4641,12 @@ Functionf49f: ; 03:749f scf ret -Functionf4ca: ; 03:74ca +Functionf4ca: ld a, [wBattleMode] and a jp nz, Functionf7dd -Functionf4d1: ; 03:74d1 +Functionf4d1: ld a, [wCurItem] ld [wMovementBufferCount], a .sub_f4d7 @@ -4701,12 +4701,12 @@ Functionf4d1: ; 03:74d1 ld hl, Textf639 call PrintText -Functionf547: ; 03:7547 +Functionf547: call ClearPalettes call GetMemSGBLayout jp Functionf7a2 -Functionf550: ; 03:7550 +Functionf550: ld a, [wBattleMode] and a jr z, .sub_f572 @@ -4728,12 +4728,12 @@ Functionf550: ; 03:7550 call PrintText jr Functionf547 -Functionf580: ; 03:7580 +Functionf580: call Functionf588 jr nz, Functionf550 jp Functionf5f0 -Functionf588: ; 03:7588 +Functionf588: xor a ld [wMonType], a call Functionf960 @@ -4767,7 +4767,7 @@ Functionf588: ; 03:7588 ret z jr .sub_f5b2 -Functionf5bd: ; 03:75bd +Functionf5bd: ld hl, wMovementBufferCount dec [hl] dec [hl] @@ -4798,10 +4798,10 @@ Functionf5bd: ; 03:75bd and a jp nz, Functionf550 -Functionf5f0: ; 03:75f0 +Functionf5f0: call Functionf7e2 -Functionf5f3: ; 03:75f3 +Functionf5f3: call ClearPalettes call GetMemSGBLayout pop af @@ -4809,34 +4809,34 @@ Functionf5f3: ; 03:75f3 ld [wFieldMoveSucceeded], a ret -Textf5ff: ; 03:75ff +Textf5ff: text "どのわざの" line "ポイントをふやす？" done -Textf610: ; 03:7610 +Textf610: text "どのわざを" line "かいふくする？" done -Textf61f: ; 03:761f +Textf61f: text_from_ram wStringBuffer2 text "は これいじょう" line "ふやすことが できません" prompt -Textf639: ; 03:7639 +Textf639: text_from_ram wStringBuffer2 text "の" line "わざポイントが ふえた！" prompt -Textf64c: ; 03:764c +Textf64c: text "わざポイントが" line "かいふくした！" prompt -Functionf65d: ; 03:765d +Functionf65d: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4844,19 +4844,19 @@ Functionf65d: ; 03:765d ld a, $0b jp FarCall_hl -Functionf66c: ; 03:766c +Functionf66c: jp Functionf7dd -Functionf66f: ; 03:766f +Functionf66f: jp Functionf7dd -Functionf672: ; 03:7672 +Functionf672: jp Functionf7dd -Functionf675: ; 03:7675 +Functionf675: jp Functionfaba -Functionf678: ; 03:7678 +Functionf678: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4936,58 +4936,58 @@ Functionf678: ; 03:7678 ret c jp Functionf7a2 -Textf723: ; 03:7723 +Textf723: text "<TM>を きどうした！" prompt -Textf72e: ; 03:772e +Textf72e: text "ひでんマシンを きどうした！" -Textf73d: ; 03:773d +Textf73d: text "なかには @" -Textf744: ; 03:7744 +Textf744: text_from_ram wStringBuffer2 text "が" line "きろくされていた！" para "@" -Textf755: ; 03:7755 +Textf755: text_from_ram wStringBuffer2 text "を" line "#に おぼえさせますか？" done -Textf768: ; 03:7768 +Textf768: text_from_ram wStringBuffer1 text "と @" -Textf76f: ; 03:776f +Textf76f: text_from_ram wStringBuffer2 text "は" line "あいしょうが わるかった！" para "@" -Textf784: ; 03:7784 +Textf784: text_from_ram wStringBuffer2 text "は おぼえられない！" prompt -Functionf793: ; 03:7793 +Functionf793: ld hl, Textf8c6 call PrintText ld de, $0002 call WaitPlaySFX call TextboxWaitPressAorB_BlinkCursor -Functionf7a2: ; 03:77a2 +Functionf7a2: ld hl, wItems ld a, $01 ld [wItemQuantity], a call TossItem ret -Functionf7ae: ; 03:77ae +Functionf7ae: call Functionec7a ld de, $0100 ld a, e @@ -5006,101 +5006,101 @@ Functionf7ae: ; 03:77ae call PrintText jr Functionf7a2 -Functionf7d8: ; 03:77d8 +Functionf7d8: ld hl, Textf8a5 jr Functionf7f4 -Functionf7dd: ; 03:77dd +Functionf7dd: ld hl, Textf7fb jr Functionf7f4 -Functionf7e2: ; 03:77e2 +Functionf7e2: ld hl, Textf841 jr Functionf7f4 -Functionf7e7: ; 03:77e7 +Functionf7e7: ld hl, Textf822 jr Functionf7f4 -Functionf7ec: ; 03:77ec +Functionf7ec: ld hl, Textf874 jr Functionf7f4 -Functionf7f1: ; 03:77f1 +Functionf7f1: ld hl, Textf88d -Functionf7f4: ; 03:77f4 +Functionf7f4: xor a ld [wFieldMoveSucceeded], a jp PrintText -Textf7fb: ; 03:77fb +Textf7fb: text "オーキドの ことば<⋯⋯>" line "<PLAYER>よ！ こういうものには" cont "つかいどきが あるのじゃ！" prompt -Textf822: ; 03:7822 +Textf822: text "たいせつな あずかりものです！" -Textf832: ; 03:7832 +Textf832: db "" next "つかうことは できません！" prompt -Textf841: ; 03:7841 +Textf841: text "つかっても こうかがないよ" prompt -Textf850: ; 03:7850 +Textf850: text "<TRAINER>に ボールを はじかれた！" prompt -Textf860: ; 03:7860 +Textf860: text "ひとの ものを とったら どろぼう！" prompt -Textf874: ; 03:7874 +Textf874: text "ここでは じてんしゃに" next "のることは できません" prompt -Textf88d: ; 03:788d +Textf88d: text "ここでは@" -Textf893: ; 03:7893 +Textf893: text_from_ram wStringBuffer1 text "に" line "のることは できません" prompt -Textf8a5: ; 03:78a5 +Textf8a5: text "ボックスに あずけている #が" line "いっぱいなので つかえません！" prompt -Textf8c6: ; 03:78c6 +Textf8c6: text "<PLAYER>は@" -Textf8ca: ; 03:78ca +Textf8ca: text_low text_from_ram wStringBuffer2 text "を つかった！" done -Textf8d7: ; 03:78d7 +Textf8d7: text "<PLAYER>は@" -Textf8db: ; 03:78db +Textf8db: text_low text_from_ram wStringBuffer2 text "に のった" prompt -Textf8e6: ; 03:78e6 +Textf8e6: text "<PLAYER>は@" -Textf8ea: ; 03:78ea +Textf8ea: text_low text_from_ram wStringBuffer2 text "から おりた" @@ -5108,7 +5108,7 @@ Textf8ea: ; 03:78ea SECTION "engine/dumps/bank03.asm@Functionf960", ROMX -Functionf960: ; 03:7960 +Functionf960: ld a, [wMonType] and a ld hl, wPartyMon1Moves @@ -5165,22 +5165,22 @@ Functionf960: ; 03:7960 ld [wce37], a ret -Functionf9c9: ; 03:79c9 +Functionf9c9: ld a, [wWhichPokemon] call AddNTimes -Functionf9cf: ; 03:79cf +Functionf9cf: ld a, [w2DMenuDataEnd] ld c, a ld b, $00 add hl, bc ret -Functionf9d7: ; 03:79d7 +Functionf9d7: scf ret -Functionf9d9: ; 03:79d9 +Functionf9d9: ld a, [wMapId] ld de, $0003 ld hl, Datafa08 @@ -5213,7 +5213,7 @@ Functionf9d9: ; 03:79d9 ld e, $01 ret -Datafa08: ; 03:7a08 +Datafa08: dbw $00, Datafa6c dbw $01, Datafa6c dbw $03, Datafa76 @@ -5249,41 +5249,41 @@ Datafa08: ; 03:7a08 dbw $e4, Datafaa2 db $ff -Datafa6c: ; 03:7a6c +Datafa6c: db $02, $0f, $18, $0f, $47 -Datafa71: ; 03:7a71 +Datafa71: db $02, $0f, $9d, $0f, $47 -Datafa76: ; 03:7a76 +Datafa76: db $03, $0f, $2f, $0f, $9d, $0f, $4e -Datafa7d: ; 03:7a7d +Datafa7d: db $02, $0f, $4e, $0f, $17 -Datafa82: ; 03:7a82 +Datafa82: db $02, $17, $6e, $0f, $25 -Datafa87: ; 03:7a87 +Datafa87: db $04, $0f, $58, $0f, $4e, $0f, $2f, $0f, $25 -Datafa90: ; 03:7a90 +Datafa90: db $04, $05, $18, $0f, $4e, $0f, $9d, $0f, $85 -Datafa99: ; 03:7a99 +Datafa99: db $04, $0f, $1b, $0f, $5c, $0f, $17, $0f, $9d -Datafaa2: ; 03:7aa2 +Datafaa2: db $04, $17, $08, $17, $9e, $17, $8a, $17, $5d -Datafaab: ; 03:7aab +Datafaab: db $04, $17, $9e, $0f, $4e, $0f, $9d, $0f, $85 -Functionfab4: ; 03:7ab4 +Functionfab4: call LoadMapPart jp UpdateSprites -Functionfaba: ; 03:7aba +Functionfaba: ld a, [wd8a2] cp $02 jr c, .sub_fade @@ -5406,17 +5406,17 @@ Functionfaba: ; 03:7aba call PrintText jr Functionfbde -Functionfbde: ; 03:7bde +Functionfbde: call ClearBGPalettes call Function360b call GetMemSGBLayout jp ReloadFontAndTileset -Functionfbea: ; 03:7bea +Functionfbea: ld hl, Textfc91 jp PrintText -Functionfbf0: ; 03:7bf0 +Functionfbf0: ld a, [wd8fd] ld b, a srl b @@ -5441,75 +5441,75 @@ Functionfbf0: ; 03:7bf0 ld [wce37], a ret -Textfc19: ; 03:7c19 +Textfc19: text "わたしは こずくりやさん" line "さて どうする？" done -Datafc30: ; 03:7c30 +Datafc30: db $40, $04, $0d, $0b, $13 dw Datafc38 db $01 -Datafc38: ; 03:7c38 +Datafc38: db $80, $03 db "あずける@" -Textfc3f: ; 03:7c3f +Textfc3f: db "ひきとる@" -Textfc44: ; 03:7c44 +Textfc44: db "やめる@" -Textfc48: ; 03:7c48 +Textfc48: text "あずけた！" prompt -Textfc4f: ; 03:7c4f +Textfc4f: text "すでに ２ひきの#を" line "あずかっています" prompt -Textfc64: ; 03:7c64 +Textfc64: text "こずくりを ちゅうししますか？" done -Textfc75: ; 03:7c75 +Textfc75: text "#は いっぴきも" line "あずかってませんが" prompt -Textfc89: ; 03:7c89 +Textfc89: text "ひきとった！" prompt -Textfc91: ; 03:7c91 +Textfc91: text "てもちも マサキの <PC>も" line "#で いっぱいのようです" prompt -Textfcac: ; 03:7cac +Textfcac: text "それでは こづくりします！" prompt -Textfcbb: ; 03:7cbb +Textfcbb: text "あいしょうが いいようです" prompt -Textfcca: ; 03:7cca +Textfcca: text "あいしょうが わるいようです" prompt -Textfcda: ; 03:7cda +Textfcda: text "せいべつが あわないようです" prompt -Textfcea: ; 03:7cea +Textfcea: text "ざんねんながら まだ うまれて" line "こないようです" prompt -Functionfd03: ; 03:7d03 +Functionfd03: ld hl, Textfd2e call PrintText call YesNoBox @@ -5527,15 +5527,15 @@ Functionfd03: ; 03:7d03 call Predef jp Functionfbde -Textfd2e: ; 03:7d2e +Textfd2e: text "タマゴが うまれました！" line "ひきとりますか？" done -Functionfd45: ; 03:7d45 +Functionfd45: ret -Functionfd46: ; 03:7d46 +Functionfd46: ld a, [wMapBlocksAddress] inc a ld [wMapBlocksAddress], a @@ -5570,7 +5570,7 @@ Functionfd46: ; 03:7d46 ld c, $02 ret -Datafd7b: ; 03:7d7b +Datafd7b: db $01, $3f db $02, $4b db $03, $54 @@ -5596,7 +5596,7 @@ Datafd7b: ; 03:7d7b db $fe, $fd db $ff, $ff -Functionfdab: ; 03:7dab +Functionfdab: ld a, $02 call GetPartyParamLocation ld a, [wce32] @@ -5616,30 +5616,30 @@ Functionfdab: ; 03:7dab scf ret -Textfdc7: ; 03:7dc7 +Textfdc7: text_from_ram wStringBuffer1 text "は すでに" line "@" -Textfdd2: ; 03:7dd2 +Textfdd2: text_from_ram wStringBuffer2 text "を おぼえています" prompt -Textfde0: ; 03:7de0 +Textfde0: db "います" prompt ; NOTE: This is missing the preceeding "text_from_ram" byte -Textfde4: ; 03:7de4 +Textfde4: dw wStringBuffer2 text "を おぼえています" prompt -Datafdf1: ; 03:7df1 +Datafdf1: db $28, $3c -Functionfdf3: ; 03:7df3 +Functionfdf3: ld a, [wce32] ld b, a ld c, $04 @@ -5657,17 +5657,17 @@ Functionfdf3: ; 03:7df3 scf ret -Textfe0a: ; 03:7e0a +Textfe0a: text_from_ram wStringBuffer1 text "は すでに" line "@" -Textfe15: ; 03:7e15 +Textfe15: text_from_ram wStringBuffer2 text "を おぼえています" prompt -Datafe23: ; 03:7e23 +Datafe23: db $e0, $22, $47, $24, $80, $a3, $01, $50 db $02, $85, $b0, $09, $35, $51, $2c, $08 db $24, $25, $0b, $84, $84, $00, $4e, $3b diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 64d1c29..ca96442 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -5,7 +5,7 @@ INCLUDE "constants.asm" SECTION "engine/events/field_moves.asm", ROMX -CutFunction: ; 03:4fab +CutFunction: call .ResetScriptID .next call .ExecScript @@ -21,7 +21,7 @@ CutFunction: ; 03:4fab ld hl, .CutScriptTable jp CallJumptable -.CutScriptTable ; 03:4fc5 +.CutScriptTable init_script_table add_script TryCut add_script CheckCuttableBlock @@ -30,7 +30,7 @@ CutFunction: ; 03:4fab add_script DoCut2 add_script FailCut -TryCut: ; 03:4fd1 +TryCut: call GetMapEnvironment cp ROUTE jr z, .success @@ -44,7 +44,7 @@ TryCut: ; 03:4fd1 xor a ret -CheckCuttableBlock: ; 03:4fea +CheckCuttableBlock: call GetFacingTileCoord cp $80 jr nz, .fail @@ -67,7 +67,7 @@ CheckCuttableBlock: ; 03:4fea xor a ret -GetCutReplacementBlock: ; 03:5015 +GetCutReplacementBlock: ld c, a ld hl, CutReplacementBlocks .loop @@ -80,7 +80,7 @@ GetCutReplacementBlock: ; 03:5015 scf ret -CutReplacementBlocks: ; 03:5023 +CutReplacementBlocks: ; replacement block, facing block db $30, $25 db $31, $2A @@ -88,7 +88,7 @@ CutReplacementBlocks: ; 03:5023 db $33, $35 db -1 -CheckCuttableTile: ; 03:502c +CheckCuttableTile: call GetFacingTileCoord call IsCuttableTile jr nc, .fail @@ -110,7 +110,7 @@ CheckCuttableTile: ; 03:502c xor a ret -IsCuttableTile: ; 03:5057 +IsCuttableTile: ld hl, CuttableTiles ld c, a .loop @@ -122,32 +122,32 @@ IsCuttableTile: ; 03:5057 scf ret -CuttableTiles: ; 03:5064 +CuttableTiles: db $81 db $82 db $8A db $8B db -1 -FailCut: ; 03:5069 +FailCut: ld hl, Text_CantUseCutHere call MenuTextBoxBackup scf ld a, SCRIPT_FAIL ret -Text_CantUseCutHere: ; 03:5073 +Text_CantUseCutHere: text "ここでは つかえません" prompt DoCut: -DoCut2: ; 03:5080 +DoCut2: far_queue CutScript scf ld a, SCRIPT_SUCCESS ret -CutScript: ; 03:508C +CutScript: call RefreshScreen ld hl, wPartyMonNicknames ld a, BOXMON @@ -172,13 +172,13 @@ CutScript: ; 03:508C scf ret -Text_CutItDown: ; 03:50c4 +Text_CutItDown: text_from_ram wStringBuffer2 text " は " line "くさかりを つかった！" prompt -SurfFunction: ; 03:50d8 +SurfFunction: call .ResetScriptID .next call .ExecScript @@ -194,13 +194,13 @@ SurfFunction: ; 03:50d8 ld hl, .SurfScriptTable jp CallJumptable -.SurfScriptTable: ; 03:50f2 +.SurfScriptTable: init_script_table add_script TrySurf add_script DoSurf add_script FailSurf -TrySurf: ; 03:50f8 +TrySurf: call GetFacingTileCoord and $f0 cp $20 @@ -215,7 +215,7 @@ TrySurf: ; 03:50f8 xor a ret -DoSurf: ; 03:5113 +DoSurf: queue_ba SurfScript ld a, -1 ld [wFieldMoveScriptID], a @@ -223,7 +223,7 @@ DoSurf: ; 03:5113 ld a, SCRIPT_SUCCESS ret -FailSurf: ; 03:5124 +FailSurf: ld hl, Text_CantSurfHere call MenuTextBoxBackup ld a, -1 @@ -232,12 +232,12 @@ FailSurf: ; 03:5124 ld a, SCRIPT_FAIL ret -Text_CantSurfHere: ; 03:5133 +Text_CantSurfHere: text "ここでは のることが" next "できません" prompt -SurfScript: ; 03:5145 +SurfScript: call RefreshScreen ld hl, wPartyMonNicknames ld a, BOXMON @@ -255,7 +255,7 @@ SurfScript: ; 03:5145 call Function1fea ret -Text_UsedSurf: ; 03:5171 +Text_UsedSurf: text_from_ram wStringBuffer2 text " は " line "@" @@ -263,7 +263,7 @@ Text_UsedSurf: ; 03:5171 text "を のせた！" prompt -MovePlayerIntoWater: ; 03:5185 +MovePlayerIntoWater: call InitMovementBuffer call .get_movement_direction call AppendToMovementBuffer @@ -284,11 +284,11 @@ MovePlayerIntoWater: ; 03:5185 ret ; Direction to move player, mapped to facing direction -SurfMovementDirections: ; 03:51ab +SurfMovementDirections: db 4, 5, 6, 7 -FlyFunction: ; 03:51af +FlyFunction: call .ResetScriptID .next call .ExecScript @@ -304,14 +304,14 @@ FlyFunction: ; 03:51af ld hl, .FlyScriptTable jp CallJumptable -.FlyScriptTable: ; 03:51c9 +.FlyScriptTable: init_script_table add_script TryFly add_script ShowFlyMap add_script DoFly add_script FailFly -TryFly: ; 03:51d1 +TryFly: call GetMapEnvironment cp TOWN jr z, .success @@ -325,7 +325,7 @@ TryFly: ; 03:51d1 xor a ret -ShowFlyMap: ; 03:51ea +ShowFlyMap: call LoadStandardMenuHeader call ClearSprites callab FlyMap @@ -348,7 +348,7 @@ ShowFlyMap: ; 03:51ea ld a, SCRIPT_FAIL ret -DoFly: ; 03:521f +DoFly: ld a, [wFlyDestination] inc a ld [wDefaultSpawnPoint], a @@ -359,7 +359,7 @@ DoFly: ; 03:521f ld a, SCRIPT_SUCCESS ret -FailFly: ; 03:5237 +FailFly: ld hl, Text_CantUseFlyHere call MenuTextBoxBackup ld a, -1 @@ -368,17 +368,17 @@ FailFly: ; 03:5237 ld a, SCRIPT_FAIL ret -Text_CantUseFlyHere: ; 03:5246 +Text_CantUseFlyHere: text "ここでは つかえません！" prompt -FlyScript: ; 03:5254 +FlyScript: ld a, MAPSETUP_TELEPORT ldh [hMapEntryMethod], a jpab Functionfcc24 -DigFunction: ; 03:5260 +DigFunction: call .ResetScriptID .next ld a, [wFieldMoveScriptID] @@ -399,13 +399,13 @@ DigFunction: ; 03:5260 ld [wFieldMoveScriptID], a ret -.DigScriptTable: ; 03:527D +.DigScriptTable: init_script_table add_script CheckCanDig add_script DoDig add_script FailDig -CheckCanDig: ; 03:5283 +CheckCanDig: call GetMapEnvironment cp INDOOR jr z, .success @@ -417,24 +417,24 @@ CheckCanDig: ; 03:5283 set_script DoDig ret -DoDig: ; 03:529a +DoDig: queue_ab DigScript ld a, SCRIPT_FINISHED_MASK | SCRIPT_SUCCESS ld [wFieldMoveScriptID], a ret -FailDig: ; 03:52a8 +FailDig: ld hl, Text_CantUseDigHere call MenuTextBoxBackup ld a, SCRIPT_FINISHED_MASK | SCRIPT_FAIL ld [wFieldMoveScriptID], a ret -Text_CantUseDigHere: ; 03:52b4 +Text_CantUseDigHere: text "ここでは つかえません！" prompt -DigScript: ; 03:52c2 +DigScript: ld hl, wDigWarpNumber ld de, wNextWarp ld bc, 3 @@ -443,10 +443,10 @@ DigScript: ; 03:52c2 ldh [hMapEntryMethod], a jpab Functionfcc24 -EmptyFunctiond2da: ; 03:52da +EmptyFunctiond2da: ret -TeleportFunction: ; 03:52db +TeleportFunction: xor a ld [wFieldMoveScriptID], a .next @@ -470,7 +470,7 @@ TeleportFunction: ; 03:52db add_script FailTeleport add_script CheckIfSpawnPoint -TryTeleport: ; 03:52fc +TryTeleport: call GetMapEnvironment cp TOWN jr z, .success @@ -482,7 +482,7 @@ TryTeleport: ; 03:52fc set_script CheckIfSpawnPoint ret -CheckIfSpawnPoint: ; 03:5313 +CheckIfSpawnPoint: ld a, [wLastSpawnMapGroup] ld d, a ld a, [wLastSpawnMapNumber] @@ -500,18 +500,18 @@ CheckIfSpawnPoint: ; 03:5313 set_script DoTeleport ret -Text_CantFindDestination: ; 03:533B +Text_CantFindDestination: text "とびさきが みつかりません" para "" done -DoTeleport: ; 03:534b +DoTeleport: queue_ba TeleportScript ld a, SCRIPT_FINISHED_MASK | SCRIPT_SUCCESS ld [wFieldMoveScriptID], a ret -FailTeleport: ; 03:5359 +FailTeleport: ld hl, Text_CantUseTeleportHere call MenuTextBoxBackup ld a, SCRIPT_FINISHED_MASK | SCRIPT_FAIL @@ -519,12 +519,12 @@ FailTeleport: ; 03:5359 scf ret -Text_CantUseTeleportHere: ; 03:5366 +Text_CantUseTeleportHere: text "ここでは つかえません！" para "" done -TeleportScript: ; 03:5375 +TeleportScript: call RefreshScreen ld hl, Text_ReturnToLastMonCenter call MenuTextBox @@ -536,7 +536,7 @@ TeleportScript: ; 03:5375 ldh [hMapEntryMethod], a jpab Functionfcc24 -Text_ReturnToLastMonCenter: ; 03:5395 +Text_ReturnToLastMonCenter: text "さいごに たちよった" line "#センターにもどります" done diff --git a/engine/gfx.asm b/engine/gfx.asm index d5eec1a..3bddfed 100644 --- a/engine/gfx.asm +++ b/engine/gfx.asm @@ -2,12 +2,12 @@ INCLUDE "constants.asm" SECTION "engine/gfx.asm", ROMX -LoadFontGraphics:: ; f8000 (3e:4000) +LoadFontGraphics:: ld de, FontGFX ld hl, $8800 lb bc, BANK(FontGFX), ((FontGFXEnd - FontGFX) / LEN_1BPP_TILE) jp Get1bpp -LoadFontExtraGraphicsWithCursor:: ; f800c (3e:400c) +LoadFontExtraGraphicsWithCursor:: ld de, FontExtraCDEFGHIVSLM_GFX ld hl, $9620 lb bc, BANK(FontExtraCDEFGHIVSLM_GFX), ((FontSmallKanaPunctuationGFXEnd - FontExtraCDEFGHIVSLM_GFX) / LEN_2BPP_TILE) @@ -17,13 +17,13 @@ LoadFontExtraGraphicsWithCursor:: ; f800c (3e:400c) lb bc, BANK(BlackTileAndCursor1bppGFX), ((BlackTileAndCursor1bppGFXEnd - BlackTileAndCursor1bppGFX) / LEN_1BPP_TILE) call Get1bpp jr LoadActiveFrameGraphics -LoadPokemonMenuGraphics:: ; f8026 (3e:4026) +LoadPokemonMenuGraphics:: ld de, BattleHPBarGFX ld hl, $9600 lb bc, BANK(BattleHPBarGFX), ((LevelUpGFXEnd - BattleHPBarGFX) / LEN_2BPP_TILE) call Get2bpp jr LoadActiveFrameGraphics -LoadToolgearGraphicsDebug:: ; f8034 (3e:4034) +LoadToolgearGraphicsDebug:: call LoadActiveFrameGraphics ld hl, $d153 bit 0, [hl] @@ -37,7 +37,7 @@ LoadToolgearGraphicsDebug:: ; f8034 (3e:4034) lb bc, BANK(FontExtraAB_GFX), ("Ｆ" - "Ａ" + 1) call Get2bpp ret -.loadToolgearGraphics:: ; f8057 (3e:4057) +.loadToolgearGraphics:: ld hl, $9660 ld de, FontGFX + (("０" - "ア") * $08) lb bc, BANK(FontGFX), ("９" - "０" + 1) @@ -51,7 +51,7 @@ LoadToolgearGraphicsDebug:: ; f8034 (3e:4034) lb bc, BANK(HUD_GFX), ((HUD_GFXEnd - HUD_GFX) / LEN_2BPP_TILE) call Get2bpp ret -LoadActiveFrameGraphics:: ; f807c (3e:407c) +LoadActiveFrameGraphics:: ld a, [wActiveFrame] ld bc, (FrameGFXFirstFrameEnd - FrameGFXFirstFrame) ld hl, FrameGFX @@ -66,7 +66,7 @@ LoadActiveFrameGraphics:: ; f807c (3e:407c) lb bc, BANK(EmptyTile1bppGFX), ((EmptyTile1bppGFXEnd - EmptyTile1bppGFX) / LEN_1BPP_TILE) call Get1bpp ret -LoadPokeDexGraphics:: ; f80a0 (3e:40a0) +LoadPokeDexGraphics:: call LoadPokemonMenuGraphics ld de, PokedexGFX ld hl, $9600 @@ -76,7 +76,7 @@ LoadPokeDexGraphics:: ; f80a0 (3e:40a0) ld hl, $9720 lb bc, BANK(PokeBallsGFX), 1 ; 1 of 4 tiles jp Get2bpp -LoadBattleGraphics:: ; f80bb (3e:40bb) +LoadBattleGraphics:: ld de, BattleHPBarGFX ld hl, $9600 lb bc, BANK(BattleHPBarGFX), ((BattleHPBarGFXEnd - BattleHPBarGFX) / LEN_2BPP_TILE) @@ -99,7 +99,7 @@ LoadBattleGraphics:: ; f80bb (3e:40bb) lb bc, BANK(ExpBarGFX), ((ExpBarGFXEnd - ExpBarGFX) / LEN_2BPP_TILE) call Get2bpp ret -LoadPokemonStatsGraphics:: ; f80fb (3e:40fb) +LoadPokemonStatsGraphics:: call LoadPokemonMenuGraphics ld de, HpExpBarParts0GFX ld hl, $96c0 @@ -117,13 +117,13 @@ LoadPokemonStatsGraphics:: ; f80fb (3e:40fb) ld hl, $9550 lb bc, BANK(ExpBarGFX), ((ExpBarGFXEnd - ExpBarGFX) / LEN_2BPP_TILE) call Get2bpp -LoadOnlyPokemonStatsGraphics:: ; 3E:412E +LoadOnlyPokemonStatsGraphics:: ld de, StatsGFX ld hl, $9310 lb bc, BANK(StatsGFX), ((StatsGFXEnd - StatsGFX) / LEN_2BPP_TILE) call Get2bpp ret -LoadBackpackGraphics:: ; f813b (3e:413b) +LoadBackpackGraphics:: ld de, BlackTileAndCursor1bppGFX ld hl, $9600 lb bc, BANK(BlackTileAndCursor1bppGFX), ((BlackTileAndCursor1bppGFXEnd - BlackTileAndCursor1bppGFX) / LEN_1BPP_TILE) diff --git a/engine/intro.asm b/engine/intro.asm index 8b88859..c7e5494 100644 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/intro.asm", ROMX -DemoStart:: ; 558D +DemoStart:: ld de, OakPic lb bc, BANK(OakPic), $00 call IntroDisplayPicCenteredOrUpperRight @@ -20,7 +20,7 @@ DemoStart:: ; 558D call DemoSetUpPlayer jp IntroCleanup -GameStart:: ; 55BB +GameStart:: ld de, OakPic lb bc, BANK(OakPic), $00 call IntroDisplayPicCenteredOrUpperRight @@ -95,7 +95,7 @@ GameStart:: ; 55BB ld c, $04 call DelayFrames -IntroCleanup:: ; 568E +IntroCleanup:: ld de, ShrinkPic1 lb bc, BANK(ShrinkPic1), $00 call IntroDisplayPicCenteredOrUpperRight @@ -132,7 +132,7 @@ OverworldStart:: set 0, [hl] jp Function2a85 -SetUpGameEntry:: ; 56E8 +SetUpGameEntry:: ld a, $04 ld [wd65e], a ld a, $F2 @@ -150,7 +150,7 @@ SetUpGameEntry:: ; 56E8 call CopyBytes ret -GameStartPlacement:: ; 570D +GameStartPlacement:: db $01 ; map group db MAP_PLAYER_HOUSE_2F ; map dwcoord 15, 45 ; screen anchor @@ -159,7 +159,7 @@ GameStartPlacement:: ; 570D db $00 ; in-metatile x db $01 ; in-metatile y -DebugSetUpPlayer:: ; 5715 +DebugSetUpPlayer:: call SetPlayerNamesDebug ld a, $0F ld [wd15d], a @@ -185,7 +185,7 @@ DebugSetUpPlayer:: ; 5715 call Function40fd ret -DebugFillPokedex:: ; 5755 +DebugFillPokedex:: ld b, $1F ld a, $FF .loop @@ -195,7 +195,7 @@ DebugFillPokedex:: ; 5755 ld [hl], $07 ret -FillBagWithList:: ; 5760 +FillBagWithList:: ld hl, wNumBagItems .loop ld a, [de] @@ -211,7 +211,7 @@ FillBagWithList:: ; 5760 .yump ret -DebugBagItems:: ; 5777 +DebugBagItems:: db ITEM_IMPORTANT_BAG, $01 db ITEM_BAG, $01 db ITEM_TM_HOLDER, $01 @@ -234,7 +234,7 @@ DebugBagItems:: ; 5777 db ITEM_DETECT_ORB, $63 db $FF -GiveRandomPokemon:: ; 57A0 +GiveRandomPokemon:: and a ret z .loop @@ -247,7 +247,7 @@ GiveRandomPokemon:: ; 57A0 jr nz, .loop ret -GiveRandomJohto:: ; 57B0 +GiveRandomJohto:: .loop call Random and $03 @@ -263,7 +263,7 @@ GiveRandomJohto:: ; 57B0 ld [wPartyMon1 + 1], a ret -GiveKantoStarters:: ; 57C8 +GiveKantoStarters:: ld a, $03 ld b, $20 call GivePokemon @@ -275,7 +275,7 @@ GiveKantoStarters:: ; 57C8 call GivePokemon ret -GivePokemon:: ; 57DE +GivePokemon:: ld [wMonDexIndex], a ld a, b ld [wCurPartyLevel], a @@ -283,7 +283,7 @@ GivePokemon:: ; 57DE call Predef ret -AddRandomPokemonToBox: ; 57EB +AddRandomPokemonToBox: and a ret z .loop @@ -303,7 +303,7 @@ AddRandomPokemonToBox: ; 57EB jr nz, .loop ret -RandomUnder246:: ; 5818 +RandomUnder246:: .loop call Random and a @@ -312,7 +312,7 @@ RandomUnder246:: ; 5818 jr nc, .loop ret -FillTMs:: ; 5823 +FillTMs:: ld b, $39 ld a, $01 ld hl, wTMsHMs @@ -322,7 +322,7 @@ FillTMs:: ; 5823 jr nz, .loop ret -DebugGiveKeyItems:: ; 582F +DebugGiveKeyItems:: ld hl, DebugKeyItemsList ld de, wKeyItems ld c, $FF @@ -337,14 +337,14 @@ DebugGiveKeyItems:: ; 582F ld [wNumKeyItems], a ret -DebugKeyItemsList:: ; 5844 +DebugKeyItemsList:: db ITEM_TM_HOLDER db ITEM_BALL_HOLDER db ITEM_BAG db ITEM_BICYCLE db $FF -DemoSetUpPlayer:: ; 5849 +DemoSetUpPlayer:: ld hl, wPlayerName ld de, DemoPlayerName call CopyString @@ -357,7 +357,7 @@ DemoSetUpPlayer:: ; 5849 call GiveRandomJohto ret -DemoItemList:: ; 5868 +DemoItemList:: db ITEM_POKE_BALL, $05 db ITEM_POTION, $0A db ITEM_FULL_HEAL, $0A @@ -365,13 +365,13 @@ DemoItemList:: ; 5868 db ITEM_FOCUS_ORB, $01 db $FF -DemoPlayerName:: ; 5873 +DemoPlayerName:: db "サトシ@" -DemoRivalName:: ; 5877 +DemoRivalName:: db "シゲル@" -OakSpeechDemo:: ; 587B +OakSpeechDemo:: text "ようこそ" line "ポケット モンスターの せかいへ！" cont "ごぞんじ わしが オーキドじゃ！" @@ -396,7 +396,7 @@ OakSpeechDemo:: ; 587B para "まけないよう がんばって くれい！" prompt -OakSpeech1:: ; 5956 +OakSpeech1:: text "いやあ またせた！" para "ポケット モンスターの せかいへ" @@ -408,7 +408,7 @@ OakSpeech1:: ; 5956 line "したわれて おるよ" prompt -OakSpeech2:: ; 599F +OakSpeech2:: text "きみも もちろん" line "しっているとは おもうが" @@ -418,7 +418,7 @@ OakSpeech2:: ; 599F cont "いたるところに すんでいる！" prompt -OakSpeech3:: ; 59E8 +OakSpeech3:: text "その # という いきものを" line "ひとは ぺットに したり" cont "しょうぶに つかったり" @@ -428,12 +428,12 @@ OakSpeech3:: ; 59E8 line "けんきゅうを してる というわけだ" prompt -OakSpeech4:: ; 5A35 +OakSpeech4:: text "では はじめに きみの なまえを" line "おしえて もらおう！" prompt -OakSpeech5:: ; 5A52 +OakSpeech5:: text "そして この しょうねんは" line "きみの おさななじみであり" cont"ライバルである" @@ -442,7 +442,7 @@ OakSpeech5:: ; 5A52 line "なまえは なんて いったかな？" prompt -OakSpeech6:: ; 5A8F +OakSpeech6:: text "さて きみの きねんすべき" line "たびだちのひを" cont "きろくしておこう！" @@ -450,7 +450,7 @@ OakSpeech6:: ; 5A8F para "じかんも なるべく せいかくにな！" prompt -OakSpeech7:: ; 5AC2 +OakSpeech7:: text "<PLAYER>！" para "いよいよ これから" @@ -462,7 +462,7 @@ OakSpeech7:: ; 5AC2 para "レッツ ゴー！" done -SetPlayerNamesDebug:: ; 5B07 +SetPlayerNamesDebug:: ld hl, DebugPlayerName ld de, wPlayerName call CopyNameDebug @@ -474,13 +474,13 @@ CopyNameDebug: call CopyBytes ret -DebugPlayerName: ; 5B1D +DebugPlayerName: db "コージ@" -DebugRivalName: ; 5B21 +DebugRivalName: db "レッド@" -ChoosePlayerName:: ; 5B25 +ChoosePlayerName:: call PanPortraitRight ld hl, PlayerNameMenuHeader call NamingWindow @@ -512,18 +512,18 @@ ChoosePlayerName:: ; 5B25 call PrintText ret -ChoosePlayerNameEndText: ; 5B6F +ChoosePlayerNameEndText: text "ふむ・・・" line "<PLAYER> と いうんだな！" prompt -PlayerNameMenuHeader: ; 5B81 +PlayerNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw PlayerNameMenuData db 01 ; initial selection -PlayerNameMenuData: ; 5B89 +PlayerNameMenuData: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B db 04 ; items db "じぶんできめる@" @@ -533,7 +533,7 @@ PlayerNameMenuData: ; 5B89 db 3 ; x offset for the title string db "なまえこうほ@" -ChooseRivalName:: ; 5BA9 +ChooseRivalName:: call PanPortraitRight ld hl, RivalNameMenuHeader call NamingWindow @@ -565,18 +565,18 @@ ChooseRivalName:: ; 5BA9 call PrintText ret -ChooseRivalNameEndText: ; 5BF3 +ChooseRivalNameEndText: text "そうか そうだったな" line "<RIVAL> という なまえだ" prompt -RivalNameMenuHeader: ; 5C0A +RivalNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw RivalNameMenuData db 01 ; initial selection -RivalNameMenuData: ; 5C12 +RivalNameMenuData: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B db 04 ; items db "じぶんできめる@" @@ -586,7 +586,7 @@ RivalNameMenuData: ; 5C12 db 3 db "なまえこうほ@" -MomNamePrompt:: ; 5C31 +MomNamePrompt:: ld hl, MomNameMenuHeader call NamingWindow ld a, [wMenuCursorY] @@ -613,13 +613,13 @@ MomNamePrompt:: ; 5C31 .escape ret -MomNameMenuHeader: ; 5C71 +MomNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw .MomNameMenuData db 01 ; initial selection -.MomNameMenuData: ; 5C79 +.MomNameMenuData: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B db 04 ; items db "じぶんで きめる@" @@ -629,7 +629,7 @@ MomNameMenuHeader: ; 5C71 db 3 db "なまえこうほ@" -NamingWindow:: ; 5C9B +NamingWindow:: ; loads the menu header put into hl call LoadMenuHeader call VerticalMenu @@ -639,13 +639,13 @@ NamingWindow:: ; 5C9B call CloseWindow ret -SaveCustomName:: ; 5CAC +SaveCustomName:: ld hl, wStringBuffer2 ld bc, PLAYER_NAME_LENGTH call CopyBytes ret -PanPortraitRight:: ; 5CB6 +PanPortraitRight:: hlcoord 5, 4 ld d, $06 ld e, $7E @@ -674,7 +674,7 @@ PanPortraitRight:: ; 5CB6 jr nz, .loop ret -PanPortraitLeft:: ; 5CD7 +PanPortraitLeft:: hlcoord 12, 4 ld b, $06 ld c, $7E @@ -698,11 +698,11 @@ PanPortraitLeft:: ; 5CD7 jr nz, .loop ret -MenuCallSettings:: ; 5CF3 +MenuCallSettings:: call SettingsScreen ret -FadeInIntroPic: ; 5CF7 +FadeInIntroPic: ld hl, IntroFadePalettes ld b, 6 .next @@ -722,7 +722,7 @@ IntroFadePalettes: db %11110100 db %11100100 -MovePicLeft: ; 5D0E +MovePicLeft: ld a, 119 ldh [hWX], a call DelayFrame @@ -738,7 +738,7 @@ MovePicLeft: ; 5D0E ldh [hWX], a jr .next -IntroDisplayPicCenteredOrUpperRight:: ; 5D27 +IntroDisplayPicCenteredOrUpperRight:: ; b = bank ; de = address of compressed pic ; c: 0 = centred, non-zero = upper-right @@ -767,7 +767,7 @@ IntroDisplayPicCenteredOrUpperRight:: ; 5D27 predef PlaceGraphic ret -LoadStartingSprites: ; 5D5D +LoadStartingSprites: ld de, GoldSpriteGFX lb bc, BANK(GoldSpriteGFX), $0C ld hl, VRAM_Begin @@ -791,7 +791,7 @@ LoadStartingSprites: ; 5D5D jr nz, .loop ret -GameStartSprites: ; 5D80 +GameStartSprites: db $50, $48, $00 db $50, $50, $01 db $58, $48, $02 diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 33b5e4d..78417e2 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/items/inventory.asm@Inventory", ROMX -_ReceiveItem: ; 03:4AA1 +_ReceiveItem: call DoesHLEqualwNumBagItems jp nz, PutItemInPocket push hl @@ -12,28 +12,28 @@ _ReceiveItem: ; 03:4AA1 ld hl, .Pockets jp CallJumptable -.Pockets: ; 03:4ABA +.Pockets: dw .Item dw .KeyItem dw .Ball dw .TMHM -.Item: ; 03:4AC2 +.Item: pop hl jp PutItemInPocket -.KeyItem: ; 03:4AC6 +.KeyItem: pop hl jp ReceiveKeyItem -.Ball: ; 03:4ACA +.Ball: pop hl ld a, [wCurItem] ld c, a call GetBallIndex jp ReceiveBall -.TMHM: ; 03:4AD5 +.TMHM: pop hl ld a, [wCurItem] ld c, a @@ -41,7 +41,7 @@ _ReceiveItem: ; 03:4AA1 jp ReceiveTMHM -_TossItem: ; 03:4AE0 +_TossItem: call DoesHLEqualwNumBagItems jr nz, .remove_item push hl @@ -51,38 +51,38 @@ _TossItem: ; 03:4AE0 ld hl, .Pockets jp CallJumptable -.Pockets ; 03:4AF8 +.Pockets dw .Item dw .KeyItem dw .Ball dw .TMHM -.Ball ; 03:4B00 +.Ball pop hl ld a, [wCurItem] ld c, a call GetBallIndex jp TossBall -.TMHM ; 03:4B0B +.TMHM pop hl ld a, [wCurItem] ld c, a call GetTMHMNumber jp TossTMHM -.KeyItem ; 03:4B16 +.KeyItem pop hl jp TossKeyItem -.Item ; 03:4B1A +.Item pop hl -.remove_item ; 03:4B1B +.remove_item jp RemoveItemFromPocket -_CheckItem: ; 03:4B1E +_CheckItem: call DoesHLEqualwNumBagItems jr nz, .not_bag push hl @@ -92,38 +92,38 @@ _CheckItem: ; 03:4B1E ld hl, .Pockets jp CallJumptable -.Pockets ; 03:4B36 +.Pockets dw .Item dw .KeyItem dw .Ball dw .TMHM -.Ball ; 03:4B3E +.Ball pop hl ld a, [wCurItem] ld c, a call GetBallIndex jp CheckBall -.TMHM ; 03:4B49 +.TMHM pop hl ld a, [wCurItem] ld c, a call GetTMHMNumber jp CheckTMHM -.KeyItem ; 03:4B54 +.KeyItem pop hl jp CheckKeyItems -.Item ; 03:4B58 +.Item pop hl .not_bag jp CheckTheItem -DoesHLEqualwNumBagItems: ; 03:4B5C +DoesHLEqualwNumBagItems: ld a, l cp LOW(wNumBagItems) ret nz @@ -132,7 +132,7 @@ DoesHLEqualwNumBagItems: ; 03:4B5C ret -PutItemInPocket: ; 03:4B64 +PutItemInPocket: ld d, h ld e, l inc hl @@ -217,7 +217,7 @@ PutItemInPocket: ; 03:4B64 ret -GetPocketCapacity: ; 03:4BC1 +GetPocketCapacity: ld c, MAX_ITEMS ld a, e cp a, LOW(wNumBagItems) @@ -231,7 +231,7 @@ GetPocketCapacity: ; 03:4BC1 ret -RemoveItemFromPocket: ;03:4BCF +RemoveItemFromPocket: ld d, h ld e, l inc hl @@ -280,7 +280,7 @@ RemoveItemFromPocket: ;03:4BCF ret -CheckTheItem: ; 03:4BFD +CheckTheItem: ld a, [wCurItem] ld c, a @@ -300,7 +300,7 @@ CheckTheItem: ; 03:4BFD ret -ReceiveKeyItem: ; 03:4C0E +ReceiveKeyItem: ld hl, wNumKeyItems ld a, [hli] cp a, MAX_KEY_ITEMS @@ -321,7 +321,7 @@ ReceiveKeyItem: ; 03:4C0E ret -TossKeyItem: ; 03:4C28 +TossKeyItem: ld hl, wNumKeyItems dec [hl] inc hl @@ -345,7 +345,7 @@ TossKeyItem: ; 03:4C28 ret -CheckKeyItems: ; 03:4C40 +CheckKeyItems: ld a, [wCurItem] ld c, a ld hl, wKeyItems @@ -366,7 +366,7 @@ CheckKeyItems: ; 03:4C40 ; get index of ball item id c from BallItems -GetBallIndex: ; 03:4C53 +GetBallIndex: ld a, c push hl push de @@ -383,7 +383,7 @@ GetBallIndex: ; 03:4C53 ; get ball item id at index c in BallItems -GetBallByIndex: ; 03:4c66 +GetBallByIndex: push bc push hl ld b, 0 @@ -396,7 +396,7 @@ GetBallByIndex: ; 03:4c66 ret -BallItems: ; 03:4C73 +BallItems: db ITEM_MASTER_BALL db ITEM_ULTRA_BALL db ITEM_GREAT_BALL @@ -409,7 +409,7 @@ BallItems: ; 03:4C73 ; Note, the ball pocket appears to be ; a fixed length, not -1 terminated -EmptyBallPocket: ; 03:4C78 +EmptyBallPocket: ld hl, wNumBallItems xor a ld [hli], a @@ -417,7 +417,7 @@ EmptyBallPocket: ; 03:4C78 ret -ReceiveBall: ; 03:4C80 +ReceiveBall: ld hl, wBallQuantities ld b, 0 add hl, bc @@ -446,7 +446,7 @@ ReceiveBall: ; 03:4C80 ret -TossBall: ; 03:4C9F +TossBall: ld hl, wBallQuantities ld b, 0 add hl, bc @@ -476,7 +476,7 @@ TossBall: ; 03:4C9F ret -CheckBall: ; 03:4CC0 +CheckBall: ld hl, wBallQuantities ld b, 0 add hl, bc @@ -487,7 +487,7 @@ CheckBall: ; 03:4CC0 ret -ReceiveTMHM: ; 03:4CCB +ReceiveTMHM: ld b, 0 ld hl, wTMsHMs add hl, bc @@ -504,7 +504,7 @@ ReceiveTMHM: ; 03:4CCB ret -TossTMHM: ; 03:4CDE +TossTMHM: ld b, 0 ld hl, wTMsHMs add hl, bc @@ -524,7 +524,7 @@ TossTMHM: ; 03:4CDE ret -CheckTMHM: ; 03:4CF4 +CheckTMHM: ld b, 0 ld hl, wTMsHMs add hl, bc @@ -534,7 +534,7 @@ CheckTMHM: ; 03:4CF4 scf ret -GetTMHMNumber: ; 03:4CFF +GetTMHMNumber: ld a, c ld c, 0 @@ -565,7 +565,7 @@ GetTMHMNumber: ; 03:4CFF and a ret -GetNumberedTMHM: ; 03:4D1A +GetNumberedTMHM: ; Return the item id of a TM/HM by number c. ld a, c ld c, 0 @@ -592,7 +592,7 @@ SECTION "engine/items/inventory.asm@GetItemAmount", ROMX ; Returns carry if user has the item ; and the amount in b -GetItemAmount: ; 03:4e10 +GetItemAmount: call CheckAmountInItemPocket ret c call CheckAmountInKeyItems @@ -602,7 +602,7 @@ GetItemAmount: ; 03:4e10 ret ; Returns the amount of item b in b -CheckAmountInItemPocket: ; 03:4E1C +CheckAmountInItemPocket: ld hl, wItems .loop inc hl @@ -618,7 +618,7 @@ CheckAmountInItemPocket: ; 03:4E1C ret ; Returns the amount of item b in b -CheckAmountInKeyItems: ; 03:4E2B +CheckAmountInKeyItems: ld hl, wNumKeyItems ld a, [hli] and a @@ -638,7 +638,7 @@ SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX ; Return 1 in wItemAttributeParamBuffer and ; carry if wCurItem can't be removed from the bag. -_CheckTossableItem: ; 03:53AD +_CheckTossableItem: ld a, ITEMATTR_PERMISSIONS call GetItemAttr bit CANT_TOSS_F, a @@ -648,7 +648,7 @@ _CheckTossableItem: ; 03:53AD ; Return 1 in wItemAttributeParamBuffer ; and carry if wCurItem can't be selected. -CheckSelectableItem: ; 03:53B8 +CheckSelectableItem: ld a, ITEMATTR_PERMISSIONS call GetItemAttr bit CANT_SELECT_F, a @@ -657,7 +657,7 @@ CheckSelectableItem: ; 03:53B8 ret ; Return the pocket for wCurItem in wItemAttributeParamBuffer. -CheckItemPocket: ; 03:53C3 +CheckItemPocket: ld a, ITEMATTR_POCKET call GetItemAttr and $f @@ -665,7 +665,7 @@ CheckItemPocket: ; 03:53C3 ret ; Return the context for wCurItem in wItemAttributeParamBuffer. -CheckItemContext: ; 03:53CE +CheckItemContext: ld a, ITEMATTR_HELP call GetItemAttr and $f @@ -673,7 +673,7 @@ CheckItemContext: ; 03:53CE ret ; Return the menu for wCurItem in wItemAttributeParamBuffer. -CheckItemMenu: ; 03:53D9 +CheckItemMenu: ld a, ITEMATTR_HELP call GetItemAttr swap a @@ -682,7 +682,7 @@ CheckItemMenu: ; 03:53D9 ret ; Get attribute a of wCurItem. -GetItemAttr: ; 03:53E6 +GetItemAttr: push hl push bc ld hl, ItemAttributes @@ -702,14 +702,14 @@ GetItemAttr: ; 03:53E6 pop hl ret -ItemAttr_ReturnCarry: ; 03:5405 +ItemAttr_ReturnCarry: ld a, 1 ld [wItemAttributeParamBuffer], a scf ret ; Return the price of wCurItem in de. -GetItemPrice: ; 03:540C +GetItemPrice: push hl push bc ld a, ITEMATTR_PRICE diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index afd2ce3..a165473 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/items/item_effects.asm", ROMX -ApplyPPUp: ; 03:78f6 +ApplyPPUp: ld a, MON_MOVES call GetPartyParamLocation push hl @@ -35,7 +35,7 @@ ApplyPPUp: ; 03:78f6 inc de jr .loop -ComputeMaxPP: ; 03:792B +ComputeMaxPP: push bc ; Divide the base PP by 5. ld a, [de] diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index f3290fe..b49b929 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/items/tmhm.asm", ROMX -CanLearnTMHMMove: ; 04:528f +CanLearnTMHMMove: ; Gets the index of TM or HM with move ID wce32, ; then checks the corresponding flag in wMonDexIndex's learnset. ; Sets register c to 1 if TM/HM is in learnset OR if debug is enabled. @@ -37,7 +37,7 @@ CanLearnTMHMMove: ; 04:528f pop de ret -GetTMHMMove: ; 04:52C1 +GetTMHMMove: ; converts TM/HM list index to TM/HM move ID ld a, [wNamedObjectIndexBuffer] dec a diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 955072d..0d33b5a 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/link/place_waiting_text.asm", ROMX -PlaceWaitingText:: ; 1:4000 +PlaceWaitingText:: hlcoord 3, 10 ld b, 1 ld c, 11 diff --git a/engine/math/math.asm b/engine/math/math.asm index 02d8040..750ada8 100644 --- a/engine/math/math.asm +++ b/engine/math/math.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/math/math.asm", ROMX -_Multiply:: ; 6810 +_Multiply:: ; hMultiplier is one byte. ld a, 8 @@ -89,7 +89,7 @@ _Multiply:: ; 6810 ; 6870 -_Divide:: ; 6870 +_Divide:: xor a ldh [hMathBuffer + 0], a ldh [hMathBuffer + 1], a diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 9289084..b9b3081 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -22,7 +22,7 @@ DebugMenu:: ; $4031 ld hl, DebugJumpTable jp CallJumptable -DebugJumpTable:: ; 4064 +DebugJumpTable:: dw DebugMenuOptionFight dw DebugMenuOptionField dw Function094c ; sound test @@ -30,13 +30,13 @@ DebugJumpTable:: ; 4064 dw DebugMenuOptionMonsterTest dw DebugMenuOptionName -DebugMenuHeader: ; 4070 +DebugMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 05, 02, SCREEN_WIDTH - 7, SCREEN_HEIGHT - 1 dw .MenuData db 01 ; default option -.MenuData: ; 4078 +.MenuData: db $A0 db 0 ; items dw DebugMenuItems @@ -61,12 +61,12 @@ DebugMenuItems: db 05 db -1 -DebugMenuOptionField:: ; 40A8 +DebugMenuOptionField:: ld hl, wDebugFlags set DEBUG_FIELD_F, [hl] ; set debug mode jp StartNewGame -DebugMenuOptionFight:: ; 40B0 +DebugMenuOptionFight:: ld hl, wDebugFlags set DEBUG_BATTLE_F, [hl] ld a, $54 @@ -75,11 +75,11 @@ DebugMenuOptionFight:: ; 40B0 res DEBUG_BATTLE_F, [hl] ret -DebugMenuOptionSubGames:: ; 40C0 +DebugMenuOptionSubGames:: callab CallSubGameMenu jp DebugMenu -DebugMenuOptionMonsterTest:: ; 40CB +DebugMenuOptionMonsterTest:: ld hl, wPokedexOwned ld de, wPokedexSeen ld b, $1F @@ -100,7 +100,7 @@ DebugMenuOptionMonsterTest:: ; 40CB Function40eb:: jp DebugMenu -DebugMenuOptionName:: ; 40EE +DebugMenuOptionName:: callab OpenTrainerGear ld a, $e4 ldh [rBGP], a diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 02ec29d..c5c19d0 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -87,7 +87,7 @@ InitializeByteList: SECTION "engine/menu/main_menu.asm@MainMenu", ROMX -MainMenu:: ; 01:53CC +MainMenu:: ld hl, wd4a9 res 0, [hl] call ClearTileMap @@ -123,27 +123,27 @@ MainMenu:: ; 01:53CC ld a, [wMenuSelection] jp CallJumptable -MainMenuHeader: ; 01:5418 +MainMenuHeader: db MENU_BACKUP_TILES menu_coords 0, 0, 13, 7 dw .MenuData db 1 ; default option -.MenuData: ; 01:5420 +.MenuData: db $80 db 0 ; items dw MainMenuItems db $8a, $1f dw .Strings -.Strings: ; 01:5428 +.Strings: db "つづきから はじめる@" db "さいしょから はじめる@" db "せっていを かえる@" db "#を あそぶ@" db "じかんセット@" -MainMenuJumptable: ; 01:5457 +MainMenuJumptable: dw MainMenuOptionContinue dw StartNewGame dw MenuCallSettings @@ -178,11 +178,11 @@ PlayPokemonSetTimeMenu: db SET_TIME db -1 -MainMenuOptionSetTime:: ; 5473 +MainMenuOptionSetTime:: callab SetTime ret -MainMenuOptionContinue:: ;547C +MainMenuOptionContinue:: callab Function14624 call DisplayContinueGameInfo .loop @@ -212,7 +212,7 @@ MainMenuOptionContinue:: ;547C call DelayFrames jp OverworldStart -DisplayContinueGameInfo:: ; 54BF +DisplayContinueGameInfo:: xor a ldh [hBGMapMode], a hlcoord 4, 7 @@ -237,7 +237,7 @@ DisplayContinueGameInfo:: ; 54BF call DelayFrames ret -PrintNumBadges:: ;54FA +PrintNumBadges:: push hl ld hl, wd163 ; badges? ld b, $01 @@ -247,7 +247,7 @@ PrintNumBadges:: ;54FA ld bc, $0102 ; flags and constants for this? 1 byte source, 2 digit display jp PrintNumber -PrintNumOwnedMons:: ; 550D +PrintNumOwnedMons:: push hl ld hl, wPokedexOwned ld b, $20 ; flag_array NUM_POKEMON? @@ -257,7 +257,7 @@ PrintNumOwnedMons:: ; 550D ld bc, $0103 ; 1 byte, 3 digit jp PrintNumber -PrintPlayTime:: ; 5520 +PrintPlayTime:: ld de, hRTCHours ld bc, $0103 ; 1 byte, 3 digit call PrintNumber @@ -274,7 +274,7 @@ PlayerInfoText: next "プレイじかん" text_end -StartNewGame:: ; 555C +StartNewGame:: ld de, MUSIC_NONE call PlayMusic ld de, MUSIC_OAK_INTRO diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm index 6e2b99b..8384ee6 100644 --- a/engine/menu/reset_dialog.asm +++ b/engine/menu/reset_dialog.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/menu/reset_dialog.asm", ROMX -DisplayResetDialog:: ; fc362 (3f:4362) +DisplayResetDialog:: ld hl, _ResetConfirmText call MenuTextBox call YesNoBox diff --git a/engine/menu/set_time.asm b/engine/menu/set_time.asm index c7c4aa3..15e40dc 100644 --- a/engine/menu/set_time.asm +++ b/engine/menu/set_time.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/menu/set_time.asm", ROMX -SetTime: ; 36:7ae4 +SetTime: ld hl, wStartHour ldh a, [hRTCHours] ld [hli], a @@ -12,7 +12,7 @@ SetTime: ; 36:7ae4 call PrintText ret -Textdbaf4: ; 36:7af4 +Textdbaf4: deciram wStartHour, 1, 2 text " じ" line "@" @@ -72,7 +72,7 @@ Textdbaf4: ; 36:7af4 call Function0502 jp Function3036 -Textdbb6c: ; 36:7b6c +Textdbb6c: deciram wStartHour, 1, 2 text " じ" line "@" diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 6a8f433..5b91246 100644 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/menu/start_menu.asm", ROMX -DisplayStartMenu: ; 04:5DBE +DisplayStartMenu: call RefreshScreen ld de, $0003 call PlaySFX @@ -26,7 +26,7 @@ DisplayStartMenu: ; 04:5DBE ld hl, .StartMenuEntriesReturnTable jp CallJumptable -.StartMenuEntriesReturnTable: ; 04:5DFC +.StartMenuEntriesReturnTable: dw .RefreshStartDisplay dw .MainReturn dw .exit @@ -43,7 +43,7 @@ DisplayStartMenu: ; 04:5DBE call UpdateTimePals ret -.unused ; 04:5E16 +.unused call .WaitForARelease call LoadFontExtra call CloseWindow @@ -56,26 +56,26 @@ DisplayStartMenu: ; 04:5DBE jr nz, .WaitForARelease ret -.ExitAndHookFF: ; 04:5E2B +.ExitAndHookFF: call ExitMenu ld a, $FF ldh [hStartmenuCloseAndSelectHookEnable], a jr .UpdateTime -.StartMenuHeader: ; 04:5E34 +.StartMenuHeader: db MENU_BACKUP_TILES menu_coords $0C, 00, $13, $11 dw .MenuData db 1 ; default option -.MenuData: ; 04:5E3C +.MenuData: db $A8 ; flags db 0 ; items dw StartMenuItems db $8A, $1F dw .Strings -.Strings: ; 04:5E44 +.Strings: db "ずかん@" db "ポケモン@" db "りュック@" @@ -86,7 +86,7 @@ DisplayStartMenu: ; 04:5DBE db "わくせん@" db "りセット@" -StartMenuJumpTable: ; 04:5E6C +StartMenuJumpTable: dw StartMenu_Pokedex dw StartMenu_Party dw StartMenu_Backpack @@ -97,7 +97,7 @@ StartMenuJumpTable: ; 04:5E6C dw StartMenu_TrainerGear dw StartMenu_Reset -StartMenuItems: ; 04:5E7E +StartMenuItems: db 4 db START_SAVE db START_OPTIONS @@ -141,7 +141,7 @@ StartMenuItems: ; 04:5E7E db START_EXIT db -1 -GetStartMenuState: ; 04:5EA4 +GetStartMenuState: ; Stores one of four values to wActiveBackpackPocket ; based on story flags and debug mode. ; 4 = debug, 3 = starting, 2 = rival beat in lab @@ -168,30 +168,30 @@ GetStartMenuState: ; 04:5EA4 ld [wActiveBackpackPocket], a ret -StartMenu_Exit: ; 04:5ECF +StartMenu_Exit: ; Exits the menu ld a, 1 ret -StartMenu_TrainerGear: ; 04:5ED2 +StartMenu_TrainerGear: callab TrainerGear ld a, 0 ret -StartMenu_Reset: ; 04:5EDD +StartMenu_Reset: ld hl, DisplayResetDialog ld a, BANK(DisplayResetDialog) call DisplayResetDialog ; should be farcall ld a, 0 ret -StartMenu_Save: ; 04:5EE8 +StartMenu_Save: predef Function143e0 call UpdateSprites ld a, 0 ret -StartMenu_Settings: ; 04:5EF3 +StartMenu_Settings: call LoadStandardMenuHeader xor a ldh [hBGMapMode], a @@ -208,12 +208,12 @@ StartMenu_Settings: ; 04:5EF3 ld a, 0 ret -StartMenu_TrainerCard: ; 04:5F1F +StartMenu_TrainerCard: call _TrainerCard ld a, 0 ret -_TrainerCard: ; 04:5F25 +_TrainerCard: call LoadStandardMenuHeader ldh a, [hMapAnims] push af @@ -231,7 +231,7 @@ _TrainerCard: ; 04:5F25 ldh [hMapAnims], a ret -StartMenu_Pokedex: ; 04:5F4F +StartMenu_Pokedex: call LoadStandardMenuHeader predef Function40000 call ClearPalettes @@ -244,18 +244,18 @@ StartMenu_Pokedex: ; 04:5F4F ld a, 0 ret -UnusedToolPocketData: ; 04:5F6F +UnusedToolPocketData: dw ToolsPocketHeader dw wRegularItemsCursor dw wRegularItemsScrollPosition -ToolsPocketHeader: ; 04:5F75 +ToolsPocketHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .ToolsPocketData db 1 -.ToolsPocketData ; 04:5F7D +.ToolsPocketData db $AD db 4, 9, 2, 0 dw wNumBagItems @@ -268,13 +268,13 @@ ToolsPocketHeader: ; 04:5F75 dw wBackpackAndKeyItemsCursor dw wBackpackAndKeyItemsScrollPosition -KeyItemsPocketHeader: ; 04:5F93 +KeyItemsPocketHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .KeyPocketData db 1 -.KeyPocketData ; 04:5F9B +.KeyPocketData db $AD db 4, 9, 1, 0 dw wNumKeyItems @@ -283,13 +283,13 @@ KeyItemsPocketHeader: ; 04:5F93 dba Function24783 dba Function241ef -BackpackMenuHeader: ; 04:5FAB +BackpackMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .BackpackData db 01 -.BackpackData ; 04:5FB3 +.BackpackData db $A1 db 4, 9, 2, 0 dw wNumBagItems @@ -298,7 +298,7 @@ BackpackMenuHeader: ; 04:5FAB dba Function24783 dba Function241ef -GetPocket2Status: ; 04:5FC3 +GetPocket2Status: ; puts 2 in wActiveBackpackPocket if pocket 2 has items ; otherwise puts 1 in ld a, 2 @@ -310,7 +310,7 @@ GetPocket2Status: ; 04:5FC3 ld [wActiveBackpackPocket], a ret -FlipPocket2Status: ; 04:5FD3 +FlipPocket2Status: ; stores 1 in wactivebackpocket if it's currently 2 ; and vice versa ld a, [wActiveBackpackPocket] @@ -322,7 +322,7 @@ FlipPocket2Status: ; 04:5FD3 ld [wActiveBackpackPocket], a ret -CheckItemsQuantity: ; 04:5FE2 +CheckItemsQuantity: ; sets clear flag if you have no items ld a, [wNumBagItems] and a @@ -333,7 +333,7 @@ CheckItemsQuantity: ; 04:5FE2 scf ret -DrawBackpack: ; 04:5FEE +DrawBackpack: ld hl, wVramState res 0, [hl] call ClearSprites @@ -351,7 +351,7 @@ DrawBackpack: ; 04:5FEE call ExitMenu ret -StartMenu_Backpack: ; 04:6015 +StartMenu_Backpack: call CheckItemsQuantity jr c, .NoItems call LoadStandardMenuHeader @@ -382,12 +382,12 @@ StartMenu_Backpack: ; 04:6015 ret .NoItems - call DrawNoItemsText ; 6371 + call DrawNoItemsText scf ld a, 0 ret -DebugBackpackLoop: ; 04:6056 +DebugBackpackLoop: ; checks the field debug flag, if set this runs ; otherwise NondebugBackpackLoop runs ; if wactivebackpackpocket is 1 (doesn't have key items) then jumps below @@ -413,7 +413,7 @@ DebugBackpackLoop: ; 04:6056 ld [wRegularItemsCursor], a jp HandleBackpackInput -.ToolsPocketText ; 04:608F +.ToolsPocketText db " ふつうの どうぐ @" .NoTools @@ -433,10 +433,10 @@ DebugBackpackLoop: ; 04:6056 ld [wBackpackAndKeyItemsCursor], a jr HandleBackpackInput -KeyItemsPocketText: ; 04:60CD +KeyItemsPocketText: db " だいじな もの @" -NondebugBackpackLoop: ; 04:60E2 +NondebugBackpackLoop: ld hl, BackpackMenuHeader call CopyMenuHeader ld de, BackpackHeaderText @@ -453,10 +453,10 @@ NondebugBackpackLoop: ; 04:60E2 ld [wBackpackAndKeyItemsCursor], a jr HandleBackpackInput -BackpackHeaderText: ; 04:610B +BackpackHeaderText: db " りュックの なか @" -HandleBackpackInput: ; 04:611F +HandleBackpackInput: ld a, [wMenuJoypad] cp A_BUTTON jp z, .BackpackA @@ -470,33 +470,33 @@ HandleBackpackInput: ; 04:611F jp z, .BackpackSelect jp .exit -.BackpackSwapPocket ; 04:613E +.BackpackSwapPocket call FlipPocket2Status xor a ld [wSelectedSwapPosition], a jp .exit -.BackpackSelect ; 04:6148 +.BackpackSelect callab Function245c5 jp .exit -.exit ; 04:6153 +.exit jp DebugBackpackLoop -.UnusedNoItems ; 04:6156 +.UnusedNoItems call DrawNoItemsText scf ret -.BackpackBack ; 04:615B +.BackpackBack scf ret -.BackpackA ; 04:615D +.BackpackA and a ret -BackpackSelected: ; 04:615F +BackpackSelected: callab Function243af call PlaceHollowCursor call LoadItemData @@ -505,7 +505,7 @@ BackpackSelected: ; 04:615F ld hl, .BagSelectJumptable jp CallJumptable -.BagSelectJumptable: ; 04:617E +.BagSelectJumptable: dw SelectItem dw .UnknownSelection dw BallPocketLoop @@ -514,14 +514,14 @@ BackpackSelected: ; 04:615F dw SelectItem dw SelectItem -.SwapPocket ; 04:618C +.SwapPocket call FlipPocket2Status xor a ld [wSelectedSwapPosition], a and a ret -.UnknownSelection ; 04:6195 +.UnknownSelection call LoadStandardMenuHeader callab Function2d2fc call ExitMenu @@ -529,7 +529,7 @@ BackpackSelected: ; 04:615F and a ret -BallPocketLoop: ; 04:61A8 +BallPocketLoop: call BallPocket jr c, .exit call SelectItem @@ -539,7 +539,7 @@ BallPocketLoop: ; 04:61A8 and a ret -SelectItem: ; 04:61B5 +SelectItem: call ItemUseMenu jr c, .skip1 ld a, [wMenuCursorY] @@ -553,7 +553,7 @@ SelectItem: ; 04:61B5 and a ret -ItemUseMenu: ; 04:61CE +ItemUseMenu: ; loads SelectedItemMenu if not debug, ; DebugSelectedItemMenu if debug ld a, [wDebugFlags] @@ -571,7 +571,7 @@ ItemUseMenu: ; 04:61CE call CloseWindow ret -DebugSelectedItemMenu: ; 04:61EF +DebugSelectedItemMenu: db MENU_BACKUP_TILES menu_coords $0D, $0A, $13, $10 dw .DebugSelectedItemMenuText @@ -584,7 +584,7 @@ DebugSelectedItemMenu: ; 04:61EF db "すてる@" ; toss db "とうろく@" ; register -SelectedItemMenu: ; 04:6206 +SelectedItemMenu: db MENU_BACKUP_TILES menu_coords $0E, $0A, $13, $0E dw .SelectedItemMenuText @@ -596,24 +596,24 @@ SelectedItemMenu: ; 04:6206 db "つかう@" ; use db "すてる@" ; toss -TossItemSelection: ; 04:6218 +TossItemSelection: ld de, wNumBagItems call TryTossItem and a ret -RegisterItemSelection: ; 04:6220 +RegisterItemSelection: call TryRegisterItem and a ret -UseItemSelection: ; 04:6225 +UseItemSelection: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .UseItemJumptable jp CallJumptable -.UseItemJumptable: ; 04:6236 ; jumptable +.UseItemJumptable: ; jumptable dw .FailedMove dw .unusable dw .unusable @@ -622,17 +622,17 @@ UseItemSelection: ; 04:6225 dw .SpriteItem dw .FieldMove -.unusable ; 04:6244 +.unusable call PrintCantUseText and a ret -.SimpleItem: ; 04:6249 +.SimpleItem: call UseItem and a ret -.SpriteItem: ; 04:624E +.SpriteItem: ; might be a better name for this once ; bank 5 gets sorted out call UseItem @@ -642,7 +642,7 @@ UseItemSelection: ; 04:6225 and a ret -.FieldMove: ; 04:625C +.FieldMove: call UseItem ld a, [wFieldMoveSucceeded] and a @@ -651,12 +651,12 @@ UseItemSelection: ; 04:6225 ld a, 4 ret -.FailedMove ; 04:6269 +.FailedMove call PrintCantUseText and a ret -TryTossItem: ; 04:626E +TryTossItem: push de call LoadItemData callab _CheckTossableItem @@ -688,21 +688,21 @@ TryTossItem: ; 04:626E and a ret -.TossFail ; 04:62BD ;25 +.TossFail ;25 call CantDropItem .TossReturn pop hl scf ret -.TossedText: ; 04:62C3 +.TossedText: db 1 dw wStringBuffer2 text "を " line "いくつ すてますか？" done -.TossVerifyText: ; 04:62D5 +.TossVerifyText: db 1 dw wStringBuffer2 text "を @" @@ -713,49 +713,49 @@ TryTossItem: ; 04:626E line "すててもよろしいですか？" done -.TossedTextCopy: ; 04:62F0 +.TossedTextCopy: db 1 dw wStringBuffer1 text "を" line "すてました！<PROMPT>" -CantDropItem: ; 04:62FD +CantDropItem: ld hl, .CantDropItemText call MenuTextBoxBackup ret -.CantDropItemText: ; 04:6304 +.CantDropItemText: text "それは とても たいせつなモノです" line "すてることは できません！<PROMPT>" -PrintCantUseHM: ; 04:6325 +PrintCantUseHM: ld hl, .CantUseHMText call MenuTextBoxBackup ret -.CantUseHMText: ; 04:632C +.CantUseHMText: text "かいはつちゅう です" line "いまは つかえません<PROMPT>" -PrintCantUseText: ; 04:6343 +PrintCantUseText: ld hl, .CantUseHereText call MenuTextBoxBackup ret -.CantUseHereText: ; 04:634A +.CantUseHereText: text "オーキドの ことば<⋯⋯>" line "<PLAYER>よ！ こういうものには" cont "つかいどきが あるのじゃ！<PROMPT>" -DrawNoItemsText: ; 04:6371 +DrawNoItemsText: ld hl, .NoItemsText call MenuTextBoxBackup ret -.NoItemsText: ; 04:6378 +.NoItemsText: text "どうぐ をひとつも<NEXT>もっていません！<PROMPT>" -BallPocket: ; 04:638C +BallPocket: xor a ldh [hBGMapMode], a ld hl, .BallPocketHeader @@ -780,16 +780,16 @@ BallPocket: ; 04:638C scf ret -.BallHolderText: ; 04:63B9 +.BallHolderText: db " ボール ホルダ @" -.BallPocketHeader: ; 04:63CC +.BallPocketHeader: db MENU_BACKUP_TILES menu_coords 03, 03, $11, $0A dw .MenuData db 1 -.MenuData: ; 04:63D4 +.MenuData: db SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db $80 ; horizontal spacing? @@ -800,7 +800,7 @@ BallPocket: ; 04:638C dba Function24783 dba Function241ef -DrawBackpackTitleRow: ; 04:63E4 +DrawBackpackTitleRow: push de hlcoord 0, 0 ld de, .BlankLine @@ -810,17 +810,17 @@ DrawBackpackTitleRow: ; 04:63E4 call PlaceString ret -.BlankLine: ; 04:63F6 +.BlankLine: db " @" -LoadItemData: ; 04:640B +LoadItemData: ld a, [wCurItem] ld [wce37], a call GetItemName call CopyStringToStringBuffer2 ret -StartMenuLoadSprites: ; 04:6418 +StartMenuLoadSprites: call DisableLCD ld a, 6 call UpdateSoundNTimes @@ -835,13 +835,13 @@ StartMenuLoadSprites: ; 04:6418 call GetMemSGBLayout ret -TryRegisterItem: ; 04:6440 +TryRegisterItem: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .RegisterItemJumptable jp CallJumptable -.RegisterItemJumptable ; 04:6451 +.RegisterItemJumptable dw PrintCantRegisterToolText dw PrintCantRegisterToolText dw PrintCantRegisterToolText @@ -850,7 +850,7 @@ TryRegisterItem: ; 04:6440 dw RegisterItem dw RegisterItem -RegisterItem: ; 04:645F +RegisterItem: ld a, [wItemIndex] inc a ld b, a @@ -870,22 +870,22 @@ RegisterItem: ; 04:645F call MenuTextBoxBackup ret -.RegisteredItemText: ; 04:6487 +.RegisteredItemText: db 1 dw wStringBuffer2 text "を " line "べんりボタンに とうろくした！<PROMPT>" -PrintCantRegisterToolText: ; 04:649E +PrintCantRegisterToolText: ld hl, .CantRegisterToolText call MenuTextBoxBackup ret -.CantRegisterToolText: ; 04:64A5 +.CantRegisterToolText: text "そのどうぐは " line "とうろくできません！<PROMPT>" -StartMenu_Party: ; 04:64B9 +StartMenu_Party: ld a, [wPartyCount] and a jr nz, .partynonzero @@ -895,14 +895,14 @@ StartMenu_Party: ; 04:64B9 call LoadStandardMenuHeader callab Function50756 -HandleSelectedPokemon: ; 04:64CD +HandleSelectedPokemon: xor a ld [wcdb9], a ld [wSelectedSwapPosition], a predef Function50774 jr PartyPrompt.partypromptreturn -PartyPrompt: ; 04:64DB +PartyPrompt: ld a, [wWhichPokemon] inc a ld [wSelectedSwapPosition], a @@ -915,7 +915,7 @@ PartyPrompt: ; 04:64DB jp SelectedPokemonSubmenu .return ld a, 0 -PartyPromptExit: ; 04:64FB +PartyPromptExit: push af call ClearBGPalettes call StartMenuLoadSprites @@ -929,7 +929,7 @@ PartyPromptExit: ; 04:64FB pop af ret -SelectedPokemonSubmenu: ; 04:6513 +SelectedPokemonSubmenu: hlcoord 1, 13 lb bc, 4, $12 call ClearBox @@ -947,7 +947,7 @@ SelectedPokemonSubmenu: ; 04:6513 ld a, [wd163] jp hl -PartyJumpTable: ; 04:653E +PartyJumpTable: dbw 1, PartyTryCut dbw 2, PartyTryFly dbw 3, PartyTrySurf @@ -965,14 +965,14 @@ PartyJumpTable: ; 04:653E dbw 15, PartyPokemonSummary2 dbw 16, PartyMailMenu -PartyCheckLessThanTwo: ; 04:656E +PartyCheckLessThanTwo: ; might have to do with switch? ld a, [wPartyCount] cp 2 jp c, HandleSelectedPokemon jp PartyPrompt -PartyHeldItem: ; 04:6579 +PartyHeldItem: callab Function_8f1cb ld hl, .HoldItemMenu call LoadMenuHeader @@ -998,7 +998,7 @@ PartyHeldItem: ; 04:6579 .jump jp HandleSelectedPokemon -.PartyGiveHeldItem ; 04:65B9 +.PartyGiveHeldItem call LoadStandardMenuHeader call ClearPalettes call GetPocket2Status @@ -1058,7 +1058,7 @@ PartyHeldItem: ; 04:6579 call z, PartyGiveMail jr .ExitGiveItem -.GiveItem ; 04:664B +.GiveItem ld a, [wce37] ld [wCurItem], a call PartyRecieveItem @@ -1066,16 +1066,16 @@ PartyHeldItem: ; 04:6579 call MenuTextBoxBackup jr .ExitGiveItem -.CantGive ; 04:665C +.CantGive ld hl, .CantBeEquippedText call MenuTextBoxBackup -.ExitGiveItem ;04:6662 +.ExitGiveItem call ClearPalettes call LoadFontsBattleExtra call ExitMenu ret -.PartyTryRecieveItem ; 04:666C +.PartyTryRecieveItem call SpeechTextBox call GetPartyItemOffset ld a, [hl] @@ -1102,75 +1102,75 @@ PartyHeldItem: ; 04:6579 .escape ret -.HoldItemMenu ; 04:66A1 ; verticalmenu +.HoldItemMenu ; verticalmenu db STATICMENU_NO_TOP_SPACING | STATICMENU_PLACE_TITLE menu_coords 4, 4, $e, 9 dw .HoldItemMenuText db 1 -.HoldItemMenuText ;04:66A9 +.HoldItemMenuText db $80 db 2 db "そうびを する@" db "そうびを はずす@" -.CantBeEquippedText ; 04:66BC +.CantBeEquippedText db 1 dw wStringBuffer1 text "を そうびすることは" line "できません<PROMPT>" -ItemWasEquippedText: ; 04:66D1 +ItemWasEquippedText: db 1 dw wcd11 text "は そうび していた" line "@" -.UnusedText1 ; 04:66E1 +.UnusedText1 db 1 dw wStringBuffer1 text "を はずして" para "@" -.UnusedText2 ; 04:66ED +.UnusedText2 db 1 dw wStringBuffer2 text "を そうびした！<PROMPT>" -ItemPrompt66FA: ; 04:66FA +ItemPrompt66FA: db 1 dw wcd11 text "は @" -.UnusedText3 ; 04:6701 +.UnusedText3 db 1 dw wStringBuffer2 text "を" line "そうびした！<PROMPT>" -PartyNoItemToRecieveText: ; 04:670E +PartyNoItemToRecieveText: db 1 dw wcd11 text "は なにも" line "そうび していません！<PROMPT>" -PartyItemRecieveBagFullText: ; 04:6724 +PartyItemRecieveBagFullText: text "どうぐが いっぱいで" line "そうびを はずせません！<PROMPT>" -ItemPrompt673D: ; 04:673D +ItemPrompt673D: db 1 dw wcd11 text "から @" -.UnusedText4 ; 04:6745 +.UnusedText4 db 1 dw wStringBuffer1 text "を" line "はずしました！<PROMPT>" -ItemPrompt6753: ; 04:6753 +ItemPrompt6753: db 1 dw wcd11 text "は @" @@ -1184,27 +1184,27 @@ ItemPrompt6753: ; 04:6753 line "とりかえますか？" done -GetPartyItemOffset: ; 04:6784 +GetPartyItemOffset: push af ld a, 1 call GetPartyParamLocation pop af ret -PartyRecieveItem: ; 04:678C +PartyRecieveItem: ld a, 1 ld [wItemQuantity], a ld hl, wNumBagItems call ReceiveItem ret -UnusedHandleItemJumptable: ; 04:6798 +UnusedHandleItemJumptable: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, UnusedItemJumptable jp CallJumptable -UnusedItemJumptable: ; 04:67A9 +UnusedItemJumptable: dw EmptyFunction127b7 dw PartyGiveMail dw PartyBallPocket @@ -1213,16 +1213,16 @@ UnusedItemJumptable: ; 04:67A9 dw EmptyFunction127b7 dw EmptyFunction127b7 -EmptyFunction127b7: ; 04:67B7 +EmptyFunction127b7: ret -ChangeBackpackPocket: ; 04:67B8 +ChangeBackpackPocket: call FlipPocket2Status xor a ld [wSelectedSwapPosition], a ret -PartyBallPocket: ; 04:67C0 +PartyBallPocket: call BallPocket jr c, .exit call SelectItem @@ -1231,7 +1231,7 @@ PartyBallPocket: ; 04:67C0 .exit ret -PartyGiveMail: ; 04:67CC +PartyGiveMail: call LoadStandardMenuHeader ld de, wMovementBufferCount callab ComposeMailMessage @@ -1254,7 +1254,7 @@ PartyGiveMail: ; 04:67CC call CloseSRAM ret -PartyMailMenu: ; 04:6806 +PartyMailMenu: ld hl, .MailMenu call LoadMenuHeader call VerticalMenu @@ -1316,18 +1316,18 @@ PartyMailMenu: ; 04:6806 call CloseWindow jp HandleSelectedPokemon -.MailFull ; 04:689D +.MailFull ld hl, .MailFullText call MenuTextBoxBackup jr .exit -.MailMenu ; 04:68A5 +.MailMenu db MENU_BACKUP_TILES menu_coords 04, 04, $0E, $0B dw .MailMenuStrings db 01 -.MailMenuStrings ; 04:68AD +.MailMenuStrings db $80 db 3 @@ -1335,25 +1335,25 @@ PartyMailMenu: ; 04:6806 db "メールを はずす@" db "やめる@" -.MessageRemoveMail ; 04:68C4 +.MessageRemoveMail text "メールを はずすと メッセージが" line "きえてしまいますが いいですか？" done -.DrawNick ; 04:68E7 +.DrawNick db 1 dw wStringBuffer1 text "から @" -.DeleteMailText ; 04:68EF +.DeleteMailText text "メールを" line "はずしました！<PROMPT>" -.MailFullText ; 04:68FD +.MailFullText text "どうぐが いっぱいで" line "メールを はずせません！<PROMPT>" -PartyPokemonSummary: ; 04:6916 +PartyPokemonSummary: call LoadStandardMenuHeader call ClearSprites xor a @@ -1365,7 +1365,7 @@ PartyPokemonSummary: ; 04:6916 call Call_ExitMenu jp HandleSelectedPokemon -PartyTryCut: ; 04:6934 +PartyTryCut: callab CutFunction ld a, [wFieldMoveSucceeded] cp $F @@ -1373,7 +1373,7 @@ PartyTryCut: ; 04:6934 ld a, 4 jp PartyPromptExit -PartyTryFly: ; 04:6949 +PartyTryFly: bit 2, a jp z, PrintNeedNewBadgeText callab FlyFunction @@ -1383,11 +1383,11 @@ PartyTryFly: ; 04:6949 ld a, 4 jp PartyPromptExit -PartyCantUseMove: ; 04:6963 +PartyCantUseMove: call PrintCantUseHM jp HandleSelectedPokemon -PartyTryTeleport: ; 04:6969 +PartyTryTeleport: callab TeleportFunction ld a, [wFieldMoveSucceeded] and a @@ -1395,7 +1395,7 @@ PartyTryTeleport: ; 04:6969 ld a, 4 jp PartyPromptExit -PartyTrySurf: ; 04:697D +PartyTrySurf: bit 4, a jp z, PrintNeedNewBadgeText callab SurfFunction @@ -1405,7 +1405,7 @@ PartyTrySurf: ; 04:697D ld a, 4 jp PartyPromptExit -PartyTryDig: ; 04:6996 +PartyTryDig: callab DigFunction ld a, [wFieldMoveSucceeded] cp $F @@ -1413,7 +1413,7 @@ PartyTryDig: ; 04:6996 ld a, 4 jp PartyPromptExit -PartyCalculateHealth: ; 04:69AB +PartyCalculateHealth: ld a, MON_MAXHP ; might be wrong, was $24 call GetPartyParamLocation ld a, [hli] @@ -1435,24 +1435,24 @@ PartyCalculateHealth: ; 04:69AB callab Functionf218 jp HandleSelectedPokemon -PrintNotHealthyEnoughText: ; 04:69D9 +PrintNotHealthyEnoughText: ld hl, NotHealthyEnoughText call PrintText jp HandleSelectedPokemon -NotHealthyEnoughText: ; 04:69E2 +NotHealthyEnoughText: text "たいりょくが たりません！<PROMPT>" -PrintNeedNewBadgeText: ; 04:69F1 +PrintNeedNewBadgeText: ld hl, NeedNewBadgeText call PrintText jp HandleSelectedPokemon -NeedNewBadgeText: ; 04:69FA +NeedNewBadgeText: text "あたらしい バッジを てにするまで" line "まだ つかえません！<PROMPT>" -PartyPokemonSummary2: ; 04:6A18 +PartyPokemonSummary2: ld hl, wce5f ld a, [hl] push af @@ -1463,7 +1463,7 @@ PartyPokemonSummary2: ; 04:6A18 call ClearBGPalettes jp HandleSelectedPokemon -PokeSummary: ; 04:6A2C +PokeSummary: call ClearBGPalettes call ClearTileMap call ClearSprites @@ -1515,7 +1515,7 @@ PokeSummary: ; 04:6A2C .LastPokeChosen ld de, PartyMenuAttributes call SetMenuAttributes -SummaryDrawPoke: ; 04:6AAC +SummaryDrawPoke: xor a ldh [hBGMapMode], a ld [wSelectedSwapPosition], a @@ -1543,7 +1543,7 @@ SummaryDrawPoke: ; 04:6AAC ld hl, w2DMenuFlags set 6, [hl] jr PartySelectionInputs.PartySelectSkipInputs -PartySelectionInputs: ; 04:6AF9 +PartySelectionInputs: call Get2DMenuJoypad + 3 bit B_BUTTON_F, a jp nz, PartySelectionBackOut @@ -1601,7 +1601,7 @@ PartySelectionInputs: ; 04:6AF9 predef Function2d663 jp PartySelectionInputs -.DrawMovePokeText ; 04:6B84 +.DrawMovePokeText hlcoord 1, 11 lb bc, 6, $12 call ClearBox @@ -1610,7 +1610,7 @@ PartySelectionInputs: ; 04:6AF9 call PlaceString jp PartySelectionInputs -.PartyPokeDetailsAdvancePage ; 04:6B99 +.PartyPokeDetailsAdvancePage ld hl, wWhichPokemon inc [hl] ld a, [wPartyCount] @@ -1619,7 +1619,7 @@ PartySelectionInputs: ; 04:6AF9 dec [hl] jp PartySelectionInputs -.PartyPokeDetailsBackPage ; 04:6BA8 +.PartyPokeDetailsBackPage ld hl, wWhichPokemon ld a, [hl] and a @@ -1627,7 +1627,7 @@ PartySelectionInputs: ; 04:6AF9 dec [hl] jp PokeSummary -.PartyPokeSelect ; 04:6BB4 +.PartyPokeSelect ld a, [wSelectedSwapPosition] and a jr nz, .swap @@ -1664,7 +1664,7 @@ PartySelectionInputs: ; 04:6AF9 call ClearBox jp SummaryDrawPoke -SwapEntries: ; 04:6C06 +SwapEntries: ; values at (hl + [cursor place]-1) ; and (hl + [wSelectedSwapPosition] -1) get swapped push hl ; saves hl @@ -1688,7 +1688,7 @@ SwapEntries: ; 04:6C06 ld [de], a ret -PartySelectionBackOut: ; 04:6C20 +PartySelectionBackOut: xor a ld [wSelectedSwapPosition], a ld hl, w2DMenuFlags @@ -1697,7 +1697,7 @@ PartySelectionBackOut: ; 04:6C20 call ClearTileMap ret -PartyMenuAttributes: ; 04:6C30 +PartyMenuAttributes: ; cursor y ; cursor y ; num rows @@ -1712,37 +1712,37 @@ PartyMenuAttributes: ; 04:6C30 dn 2, 0 db $F3 -PartyTypeText: ; 04:6C38 +PartyTypeText: db "タイプ/ いりょく/@" -PartyPokeDivider: ; 04:6C47 +PartyPokeDivider: db "ーーー@" -PartyMoveText: ; 04:6C4B +PartyMoveText: db "どこに いどうしますか？@" -CheckRegisteredItem: ; 04:6C58 +CheckRegisteredItem: call .RegisteredItem ret -.RegisteredItem ; 04:6C5C +.RegisteredItem call GetRegisteredItemID jr c, .NotRegistered call UseRegisteredItem ret -.NotRegistered ; 04:6C65 +.NotRegistered call RefreshScreen ld hl, .NothingRegisteredText call MenuTextBoxBackup call Function1fea ret -.NothingRegisteredText: ; 04:6C72 +.NothingRegisteredText: text "べんりボタンを おした！" line "⋯しかしなにもおきない！<PROMPT>" -GetRegisteredItemID: ; 04:6C8D +GetRegisteredItemID: ; if you can use the registered item, sets the ID to a ; otherwise sets 0 to a and sets the carry flag ld a, [wRegisteredItem] @@ -1792,13 +1792,13 @@ GetRegisteredItemID: ; 04:6C8D scf ret -UseRegisteredItem: ; 04:6CD9 +UseRegisteredItem: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .RegisteredItemJumptable jp CallJumptable -.RegisteredItemJumptable ; 04:6CEA +.RegisteredItemJumptable dw .CantUse2 dw .CantUse dw .CantUse @@ -1806,21 +1806,21 @@ UseRegisteredItem: ; 04:6CD9 dw .overworld dw .FieldMove -.CantUse ; 04:6CF6 +.CantUse call RefreshScreen call PrintCantUseText call Function1fea and a ret -.UnusedSimpleUse ; 04:6D01 +.UnusedSimpleUse call RefreshScreen call UseItem call Function1fea and a ret -.overworld ; 04:6D0C +.overworld call RefreshScreen ld hl, wVramState res 0, [hl] @@ -1832,7 +1832,7 @@ UseRegisteredItem: ; 04:6CD9 and a ret -.FieldMove ; 04:6D25 +.FieldMove call UseItem ld a, [wFieldMoveSucceeded] and a @@ -1850,7 +1850,7 @@ UseRegisteredItem: ; 04:6CD9 and a ret -TrainerCardLoop: ; 04:6D41 +TrainerCardLoop: ld a, [wVramState] push af xor a @@ -1867,7 +1867,7 @@ TrainerCardLoop: ; 04:6D41 ld [wVramState], a ret -ClearTrainerCardJumptable: ; 04:6D5E +ClearTrainerCardJumptable: ; sets four bytes at wJumpTableIndex to 0 call ClearPalettes ld hl, wJumptableIndex @@ -1882,7 +1882,7 @@ ClearTrainerCardJumptable: ; 04:6D5E call GetSGBLayout ret -HandleTrainerCardJumptable: ; 04:6D75 +HandleTrainerCardJumptable: ld a, [wJumptableIndex] ld e, a ld d, 0 @@ -1894,7 +1894,7 @@ HandleTrainerCardJumptable: ; 04:6D75 ld l, a jp hl -.TrainerCardJumptable: ; 04:6D84 +.TrainerCardJumptable: dw TrainerCardMainPage dw .IncreaseJumpTableIndex dw .IncreaseJumpTableIndex @@ -1914,15 +1914,15 @@ HandleTrainerCardJumptable: ; 04:6D75 dw TrainerCardBadgeInput dw TrainerCardSetClearFlag -.SetPalAndIncJumpTable: ; 04:6DA8 +.SetPalAndIncJumpTable: call SetPalettes -.IncreaseJumpTableIndex: ; 04:6DAB +.IncreaseJumpTableIndex: ld a, [wJumptableIndex] inc a ld [wJumptableIndex], a ret -TrainerCardMainPage: ; 04:6DB3 +TrainerCardMainPage: call ClearPalettes call ClearTileMap call TrainerCardDrawProtag @@ -1943,7 +1943,7 @@ TrainerCardMainPage: ; 04:6DB3 and a ret -TrainerCardMainInputs: ; 04:6DE3 +TrainerCardMainInputs: call EmptyFunction12e37 call GetJoypad ld hl, hJoyDown @@ -1993,10 +1993,10 @@ TrainerCardMainInputs: ; 04:6DE3 and a ret -EmptyFunction12e37: ; 04:6E37 +EmptyFunction12e37: ret -TrainerCardScroll: ; 04:6E38 +TrainerCardScroll: ld a, $90 ldh [hWY], a ld a, $9C @@ -2007,7 +2007,7 @@ TrainerCardScroll: ; 04:6E38 and a ret -TrainerCardClearTileMap: ; 04:6E49 +TrainerCardClearTileMap: xor a ldh [hWY], a ld a, $98 @@ -2019,7 +2019,7 @@ TrainerCardClearTileMap: ; 04:6E49 and a ret -TrainerCardSetWindowY: ; 04:6E5C +TrainerCardSetWindowY: ldh a, [hWY] cp $90 jr nc, TrainerCardClearPals @@ -2028,7 +2028,7 @@ TrainerCardSetWindowY: ; 04:6E5C and a ret -TrainerCardClearPals: ; 04:6E68 +TrainerCardClearPals: call ClearPalettes ld a, $90 ldh [hWY], a @@ -2038,7 +2038,7 @@ TrainerCardClearPals: ; 04:6E68 and a ret -TrainerCardBadgePage: ; 04:6E78 +TrainerCardBadgePage: call ClearPalettes call DisableLCD ld hl, TrainerCardLeadersGFX @@ -2055,7 +2055,7 @@ TrainerCardBadgePage: ; 04:6E78 and a ret -TrainerCardBadgeInput: ; 04:6E9E +TrainerCardBadgeInput: call GetJoypad ld hl, hJoyDown ld a, [hl] @@ -2067,11 +2067,11 @@ TrainerCardBadgeInput: ; 04:6E9E and a ret -TrainerCardSetClearFlag: ; 04:6EB0 +TrainerCardSetClearFlag: scf ret -TrainerCardDrawProtag: ; 04:6EB2 +TrainerCardDrawProtag: ld de, ProtagonistPic ld a, BANK(ProtagonistPic) call UncompressSpriteFromDE @@ -2086,7 +2086,7 @@ TrainerCardDrawProtag: ; 04:6EB2 call InterlaceMergeSpriteBuffers ret -PlaceMiscTilesTrainerCard: ; 04:6ED5 +PlaceMiscTilesTrainerCard: ld a, $30 ldh [hGraphicStartTile], a hlcoord 13, 1 @@ -2094,7 +2094,7 @@ PlaceMiscTilesTrainerCard: ; 04:6ED5 predef PlaceGraphic ret -DrawTrainerCardMainPage: ; 04:6EE5 +DrawTrainerCardMainPage: hlcoord 0, 0 ld d, 5 call PlaceTrainerCardBGTile @@ -2148,31 +2148,31 @@ DrawTrainerCardMainPage: ; 04:6EE5 ld [hl], "▶" ret -TrainerCardText: ; 04:6F7A +TrainerCardText: db "なまえ/<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@" -TrainerCardDexEntriesText: ; 04:6F8C +TrainerCardDexEntriesText: db "ひき@" -TrainerCardNameTiles: ; 04:6F8F +TrainerCardNameTiles: db $0A, $0C, $0D, $0E, $0F, $FF -TrainerCardIDNoTiles: ; 04:6F95 +TrainerCardIDNoTiles: db $22, $23, $FF -TrainerCardNameUnderlineTiles: ; 04:6F98 +TrainerCardNameUnderlineTiles: db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $0B, $FF -TrainerCardStatusTiles: ; 04:6FA6 +TrainerCardStatusTiles: db $0A, $10, $11, $12, $13, $FF -TrainerCardBadgesOutlineTiles: ; 04:6FAC +TrainerCardBadgesOutlineTiles: db $03, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $7F, $14, $15, $16, $17, $18, $19, $1A, $1B, $1C, $1D, $7F, $7F, $7F, $FE, $BA, $7F, $7F, $7F, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $FF -TrainerCardBadgesTextTiles: ; 04:6FE9 +TrainerCardBadgesTextTiles: db $1E, $1F, $20, $7F, $7F, $7F, $7F, $1B, $1C, $1D, $FF -DrawTrainerCaseBadgePage: ; 04:6FF4 +DrawTrainerCaseBadgePage: hlcoord 0, 0 ld d, $0E call PlaceTrainerCardBGTile @@ -2187,16 +2187,16 @@ DrawTrainerCaseBadgePage: ; 04:6FF4 call PlaceTrainerCardTiles ret -TrainerCardLeagueBadgesTextTiles: ; 04:7018 +TrainerCardLeagueBadgesTextTiles: db "#りーグバッジ@" -TrainerCardBadgesTiles: ; 04:7020 +TrainerCardBadgesTiles: db $0A, $0B, $0C, $0D, $0E, $FF -TrainerCardBadgeSilhouettesTiles: ; 04:7026 +TrainerCardBadgeSilhouettesTiles: db $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $07, $07, $02, $18, $58, $59, $5A, $19, $5B, $5C, $5D, $1A, $6B, $6C, $6D, $1B, $78, $79, $7A, $7F, $07, $07, $02, $7F, $20, $21, $22, $7F, $23, $24, $25, $7F, $26, $27, $28, $7F, $29, $2A, $2B, $7F, $07, $07, $02, $7F, $30, $31, $32, $7F, $33, $34, $35, $7F, $36, $37, $38, $7F, $39, $3A, $3B, $7F, $07, $07, $02, $7F, $40, $41, $42, $7F, $43, $44, $45, $7F, $46, $47, $48, $7F, $49, $4A, $4B, $7F, $07, $07, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $04, $07, $07, $7F, $1C, $68, $69, $6A, $1D, $7E, $6F, $6F, $1E, $5E, $5F, $6E, $1F, $7B, $7C, $7D, $02, $07, $07, $7F, $7F, $2C, $2D, $2E, $7F, $2F, $50, $51, $7F, $52, $53, $54, $7F, $55, $56, $57, $02, $07, $07, $7F, $7F, $3C, $3D, $3E, $7F, $3F, $60, $61, $7F, $62, $63, $64, $7F, $65, $66, $67, $02, $07, $07, $7F, $7F, $4C, $4D, $4E, $7F, $4F, $70, $71, $7F, $72, $73, $74, $7F, $75, $76, $77, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $07, $7F, $7F, $10, $7F, $11, $7F, $12, $7F, $13, $7F, $14, $7F, $15, $7F, $16, $7F, $17, $7F, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $06, $07, $FF -PlaceTrainerCardTiles: ; 04:712B +PlaceTrainerCardTiles: ; takes the tiles from de and places them at hl until FF is found. ld a, [de] cp $FF @@ -2205,7 +2205,7 @@ PlaceTrainerCardTiles: ; 04:712B inc de jr PlaceTrainerCardTiles -PlaceTrainerCardBGTile: ; 04:7133 +PlaceTrainerCardBGTile: ; puts tile $07 (chequered background) at coord hl. ; d controls how many times biggerloop loops. ld e, $14 diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 609e711..4f4b9ee 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -6,7 +6,7 @@ NAMINGSCREEN_UNDERSCORE EQU "♀" NAMINGSCREEN_HYPHEN EQU "♂" NAMINGSCREEN_END EQU $F0 -NamingScreen: ; 04:53F4 +NamingScreen: ld hl, wNamingScreenDestinationPointer ld [hl], e inc hl @@ -40,7 +40,7 @@ NamingScreen: ; 04:53F4 call ClearJoypad ret -.SetUpNamingScreen: ; 04:542B +.SetUpNamingScreen: call ClearBGPalettes ld b, SGB_DIPLOMA call GetSGBLayout @@ -59,7 +59,7 @@ NamingScreen: ; 04:53F4 call NamingScreenInitNameEntry ret -GetNamingScreenSetup: ; 04:5455 +GetNamingScreenSetup: ; wNamingScreenType selects which entry in the table below to jump to ld a, [wNamingScreenType] and $07 @@ -73,7 +73,7 @@ GetNamingScreenSetup: ; 04:5455 ld l, a jp hl -.Jumptable: ; 04:5466 +.Jumptable: dw .Pokemon dw .Player dw .Rival @@ -83,7 +83,7 @@ GetNamingScreenSetup: ; 04:5455 dw .Pokemon dw .Pokemon -.Pokemon: ; 04:5476 +.Pokemon: ld hl, Function8f0e3 ld a, BANK(Function8f0e3) ld e, 1 @@ -98,10 +98,10 @@ GetNamingScreenSetup: ; 04:5455 call .StoreSpriteIconParams ret -.NicknameText ; 04:5495 +.NicknameText db "のニックネームは？@" -.Player: ; 04:549F +.Player: ld de, GoldSpriteGFX call .LoadSprite hlcoord 5, 2 @@ -110,10 +110,10 @@ GetNamingScreenSetup: ; 04:5455 call .StoreSpriteIconParams ret -.NameText: ; 04:54B2 +.NameText: db "あなた の なまえは？@" -.Rival: ; 04:54BE +.Rival: ld de, SilverSpriteGFX call .LoadSprite hlcoord 5, 2 @@ -122,11 +122,11 @@ GetNamingScreenSetup: ; 04:5455 call .StoreSpriteIconParams ret -.RivalText: ; 04:54D1 +.RivalText: ; the ret just preceeding this would make the first word Rival. db "ライバル の なまえは？@" -.Mom: ; 04:54DE +.Mom: ld de, MomSpriteGFX call .LoadSprite hlcoord 5, 2 @@ -135,10 +135,10 @@ GetNamingScreenSetup: ; 04:5455 call .StoreSpriteIconParams ret -.MomText: ; 04:54F1 +.MomText: db "ははおや の なまえは？@" -.Box: ; 04:54FE +.Box: ld de, PokeBallSpriteGFX ld hl, vChars0 lb bc, BANK(PokeBallSpriteGFX), $04 @@ -159,10 +159,10 @@ GetNamingScreenSetup: ; 04:5455 call .StoreBoxIconParams ret -.BoxText: ; 04:552D +.BoxText: db "バンク の なまえは？@" -.LoadSprite: ; 04:5539 +.LoadSprite: ; copies the sprite at de into the top of VRAM, as well as the sprite $C0 after de push de ld hl, vChars0 @@ -185,7 +185,7 @@ GetNamingScreenSetup: ; 04:5455 call InitSpriteAnimStruct ret -.StoreSpriteIconParams: ; 04:5564 +.StoreSpriteIconParams: ld a, $05 ld [wNamingScreenMaxNameLength], a hlcoord 6, 5 @@ -195,7 +195,7 @@ GetNamingScreenSetup: ; 04:5455 ld [wNamingScreenStringEntryCoordX], a ret -.StoreBoxIconParams: ; 04:5575 +.StoreBoxIconParams: ld a, $08 ld [wNamingScreenMaxNameLength], a hlcoord 5, 5 @@ -205,7 +205,7 @@ GetNamingScreenSetup: ; 04:5455 ld [wNamingScreenStringEntryCoordX], a ret -NamingScreen_InitText: ; 04:5586 +NamingScreen_InitText: ; fills the tilemap with ■, then clears a 12x17 box at 1,1 ; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box) call WaitForAutoBgMapTransfer @@ -241,7 +241,7 @@ NamingScreen_InitText: ; 04:5586 ret -NamingScreenJoypadLoop: ; 04:55BD +NamingScreenJoypadLoop: call GetJoypadDebounced ld a, [wJumptableIndex] bit 7, a @@ -253,7 +253,7 @@ NamingScreenJoypadLoop: ; 04:55BD and a ret -.leap ; 04:55DA +.leap ; kills sprites and resets screen position callab InitEffectObject call ClearSprites @@ -263,7 +263,7 @@ NamingScreenJoypadLoop: ; 04:55BD scf ret -.UpdateStringEntry: ; 04:55EC +.UpdateStringEntry: ; sets BGMapMode to 0, then loads a string and coords out of a buffer and displays it. ; BGMapMode is then set to 1. xor a @@ -284,7 +284,7 @@ NamingScreenJoypadLoop: ; 04:55BD ldh [hBGMapMode], a ret -.RunJumpTable: ; 04:560C +.RunJumpTable: ld a, [wJumptableIndex] ld e, a ld d, $00 @@ -296,11 +296,11 @@ NamingScreenJoypadLoop: ; 04:55BD ld l, a jp hl -.JumpTable: ; 04:561B +.JumpTable: dw .InitCursor dw .ReadButtons -.InitCursor: ; 04:561F +.InitCursor: ld de, $5818 ld a, $39 call InitSpriteAnimStruct @@ -312,7 +312,7 @@ NamingScreenJoypadLoop: ; 04:55BD inc [hl] ret -.ReadButtons: ; 04:5634 +.ReadButtons: ; if A or B were pressed, clear hJoypadSum after calling functions; if start, set 7 in the jumptable?? ld hl, hJoypadSum ld a, [hl] @@ -326,7 +326,7 @@ NamingScreenJoypadLoop: ; 04:55BD jr nz, .jumpstart ret -.jumpa ; 04:5647 +.jumpa call NamingScreenGetLastCharacter cp NAMINGSCREEN_END jr z, .jumpstart @@ -335,19 +335,19 @@ NamingScreenJoypadLoop: ; 04:55BD ldh [hJoypadSum], a ret -.jumpb ; 04:5655 +.jumpb call NamingScreenDeleteCharacter xor a ldh [hJoypadSum], a ret -.jumpstart ; 04:565C +.jumpstart call NamingScreenStoreEntry ld hl, wJumptableIndex set 7, [hl] ret -.GetDPad: ; 04:5665 +.GetDPad: ld hl, hJoySum ld a, [hl] and D_UP @@ -363,7 +363,7 @@ NamingScreenJoypadLoop: ; 04:55BD jr nz, .rightjump ret -.rightjump ; 04:567D +.rightjump ld hl, $000C add hl, bc ld a, [hl] @@ -400,7 +400,7 @@ NamingScreenJoypadLoop: ; 04:55BD ld [hl], $00 jr .escape -.upjump ; 04:56AC :24 +.upjump ; :24 ld hl, $000D add hl, bc ld a, [hl] @@ -434,13 +434,13 @@ NamingScreenJoypadLoop: ; 04:55BD ld [hl], a ret -LetterOffsetsTable1: ; 04:56DE +LetterOffsetsTable1: db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80 LetterOffsetsTable2:; 04:56ED db $00, $08, $10, $18, $20, $28, $30, $38 -NamingScreenTryAddCharacter: ; 04:56F5 +NamingScreenTryAddCharacter: ld a, [wNamingScreenLastCharacter] ld hl, Dakutens cp "ﾞ" @@ -465,7 +465,7 @@ NamingScreenTryAddCharacter: ; 04:56F5 ld [hl], NAMINGSCREEN_UNDERSCORE ret -.jump ; 04:5724 +.jump ld a, [wNamingScreenCurNameLength] and a ret z @@ -492,7 +492,7 @@ NamingScreenTryAddCharacter: ; 04:56F5 inc [hl] ret -Dakutens: ; 04:5748 +Dakutens: db "かがきぎくぐけげこご" db "さざしじすずせぜそぞ" db "ただちぢつづてでとど" @@ -503,12 +503,12 @@ Dakutens: ; 04:5748 db "ハバヒビフブへべホボ" db $FF -Handakutens: ; 04:5799 +Handakutens: db "はぱひぴふぷへぺほぽ" db "ハパヒピフプへぺホポ" db $FF -NamingScreenDeleteCharacter: ; 04:57AE +NamingScreenDeleteCharacter: ld hl, wNamingScreenCurNameLength ld a, [hl] and a @@ -523,7 +523,7 @@ NamingScreenDeleteCharacter: ; 04:57AE ld [hl], NAMINGSCREEN_HYPHEN ret -NamingScreenGetTextCursorPosition: ; 04:57C2 +NamingScreenGetTextCursorPosition: push af ld hl, wNamingScreenDestinationPointer ld a, [hli] @@ -536,7 +536,7 @@ NamingScreenGetTextCursorPosition: ; 04:57C2 pop af ret -NamingScreenInitNameEntry: ; 04:57D2 +NamingScreenInitNameEntry: ld hl, wNamingScreenDestinationPointer ld a, [hli] ld h, [hl] @@ -554,7 +554,7 @@ NamingScreenInitNameEntry: ; 04:57D2 ld [hl], "@" ret -NamingScreenStoreEntry: ; 04:57E9 +NamingScreenStoreEntry: ld hl, wNamingScreenDestinationPointer ld a, [hli] ld h, [hl] @@ -575,7 +575,7 @@ NamingScreenStoreEntry: ; 04:57E9 jr nz, .loop ret -NamingScreenGetLastCharacter: ; 04:5803 +NamingScreenGetLastCharacter: ld hl, wNamingScreenCursorObjectPointer ld c, [hl] inc hl @@ -618,7 +618,7 @@ NamingScreenGetLastCharacter: ; 04:5803 ld [wNamingScreenLastCharacter], a ret -LoadNamingScreenGFX: ; 04:5843 +LoadNamingScreenGFX: call ClearSprites callab InitEffectObject call LoadFont @@ -669,7 +669,7 @@ LoadNamingScreenGFX: ; 04:5843 SECTION "engine/menu/text_entry.asm@mail", ROMX -ComposeMailMessage: ; 04:59EB +ComposeMailMessage: ld hl, wNamingScreenDestinationPointer ld [hl], e inc hl @@ -713,7 +713,7 @@ ComposeMailMessage: ; 04:59EB call .InitBlankMail ret -.InitBlankMail: ; 04:5A2C +.InitBlankMail: call ClearBGPalettes ld b, 8 ;diploma? call GetSGBLayout @@ -761,7 +761,7 @@ ComposeMailMessage: ; 04:59EB ld [hl], "<NEXT>" ret -InitMailText: ; 04:5A96 +InitMailText: hlcoord 5, 2 ld de, MailPromptText call PlaceString @@ -769,10 +769,10 @@ InitMailText: ; 04:5A96 ld [wNamingScreenMaxNameLength], a ret -MailPromptText: ; 04:5AA5 +MailPromptText: db "メールを かいてね@" -InitCharSet: ; 04:5AAF +InitCharSet: call WaitForAutoBgMapTransfer ld hl, wTileMap lb bc, $01, $68 @@ -802,7 +802,7 @@ InitCharSet: ; 04:5AAF jr nz, .outerloop ret -DoMailEntry: ; 04:5AE6 +DoMailEntry: call GetJoypadDebounced ld a, [wJumptableIndex] bit 7, a @@ -817,7 +817,7 @@ DoMailEntry: ; 04:5AE6 and a ret -.exit_mail ; 04:5B0A +.exit_mail callab InitEffectObject call ClearSprites xor a @@ -826,7 +826,7 @@ DoMailEntry: ; 04:5AE6 scf ret -.Update: ; 04:5B1C +.Update: xor a ldh [hBGMapMode], a hlcoord 1, 3 @@ -842,7 +842,7 @@ DoMailEntry: ; 04:5AE6 ldh [hBGMapMode], a ret -.DoJumpTable: ; 04:5B39 +.DoJumpTable: ld a, [wJumptableIndex] ld e, a ld d, 0 @@ -854,11 +854,11 @@ DoMailEntry: ; 04:5AE6 ld l, a jp hl -.Jumptable: ; 04:5B48 +.Jumptable: dw .blinkcursor dw .processjoypad -.blinkcursor ; 04:5B4C +.blinkcursor ld hl, wJumptableIndex inc [hl] ret @@ -879,7 +879,7 @@ DoMailEntry: ; 04:5AE6 jr nz, .selectjump ret -.ajump ; 04:5B69 +.ajump call NamingScreenGetLastCharacter cp "円" jr z, .startjump @@ -925,7 +925,7 @@ DoMailEntry: ; 04:5AE6 SECTION "engine/menu/text_entry.asm@mail2", ROMX -SetupMail: ; 04:5C31 +SetupMail: call ClearBGPalettes ld b, 8 call GetSGBLayout @@ -978,7 +978,7 @@ SetupMail: ; 04:5C31 ld [hl], "<NEXT>" ret -DrawMailLoadedText: ; 04:5CA9 +DrawMailLoadedText: hlcoord 5, 2 ld de, MailLoadedText call PlaceString @@ -986,10 +986,10 @@ DrawMailLoadedText: ; 04:5CA9 ld [wNamingScreenMaxNameLength], a ret -MailLoadedText: ; 04:5CB8 +MailLoadedText: db "スアケシ！！！@" ; should be "MAIL!!!" since the bold english font is loaded into vChars1 -DrawMail: ; 04:5CC0 +DrawMail: call WaitForAutoBgMapTransfer hlcoord 0, 0 lb bc, $01, $68 @@ -1013,7 +1013,7 @@ DrawMail: ; 04:5CC0 call DrawMailTextExtra ret -DrawMailRow: ; 04:5CFC +DrawMailRow: ld c, $07 call .loop inc hl @@ -1030,14 +1030,14 @@ DrawMailRow: ; 04:5CFC inc hl ld c, $05 -.loop ; 04:5D15 +.loop ld [hli], a inc a dec c jr nz, .loop ret -DrawMailTextExtra: ; 04:5D1B +DrawMailTextExtra: ld a, [de] inc de ld [hli], a @@ -1045,5 +1045,5 @@ DrawMailTextExtra: ; 04:5D1B jr nz, DrawMailTextExtra ret -MailTextExtra: ; 04:5D22 +MailTextExtra: db "？！１２３４５ ６７８９０ー円" diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 31f43a8..1e1cc51 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "engine/overworld/object_collision.asm@GetSpritesNextTile", ROMX ; Get the tile that the sprite will walk onto next -GetSpritesNextTile: ; 01:774a +GetSpritesNextTile: ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -16,7 +16,7 @@ GetSpritesNextTile: ; 01:774a ret ; Sets carry flag if the object (bc) next tile is a collision -_IsObjectCollisionTileSolid: ; 01:775a +_IsObjectCollisionTileSolid: call GetSpritesNextTile ld e, a ld d, 0 @@ -35,7 +35,7 @@ SECTION "engine/overworld/object_collision.asm@_CheckObjectCollision", ROMX ; returns the carry flag if a sprite is at coords d, e ; will not collide with sprite index stored in hEventCollisionException -_CheckObjectCollision: ; 01:77dd +_CheckObjectCollision: ld bc, wObjectStructs xor a .loop @@ -95,7 +95,7 @@ _CheckObjectCollision: ; 01:77dd SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX ; Sets the carry flag if the player will collide with another sprite's current or next position -_CheckPlayerObjectCollision: ; 01:7894 +_CheckPlayerObjectCollision: ld a, [wPlayerNextMapX] ld d, a ld a, [wPlayerNextMapY] diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index c2975c2..8a36294 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "engine/overworld/player_movement.asm@Player Movement", ROMX -OverworldMovementCheck:: ; 03:4000 +OverworldMovementCheck:: jp _OverworldMovementCheck -UnusedOverworldMovementCheck:: ; 03:4003 +UnusedOverworldMovementCheck:: ld a, PLAYER_OBJECT_INDEX ldh [hEventCollisionException], a ld a, [wPlayerDirection] @@ -26,10 +26,10 @@ UnusedOverworldMovementCheck:: ; 03:4003 jp z, OldCheckMovementSurf jp CheckMovementWalkOrBike -SetPlayerIdle: ; 03:402c +SetPlayerIdle: ld a, NO_MOVEMENT -SetPlayerMovement: ; 03:402e +SetPlayerMovement: ld [wPlayerMovement], a ld a, [wPlayerLastMapX] ld [wPlayerNextMapX], a @@ -38,11 +38,11 @@ SetPlayerMovement: ; 03:402e and a ret -CheckMovementWalkOrBike: ; 03:403f +CheckMovementWalkOrBike: call _CheckMovementWalkOrBike jp SetPlayerMovement -_CheckMovementWalkOrBike: ; 03:4045 +_CheckMovementWalkOrBike: ld a, d and D_PAD jp z, .idle @@ -142,12 +142,12 @@ _CheckMovementWalkOrBike: ; 03:4045 ld a, FACE_UP ret -CheckMovementDebug:: ; 03:40eb +CheckMovementDebug:: ld a, d call _CheckMovementDebug jp SetPlayerMovement -_CheckMovementDebug: ; 03:40f2 +_CheckMovementDebug: bit D_DOWN_F, a jr nz, .move_down bit D_UP_F, a @@ -191,11 +191,11 @@ _CheckMovementDebug: ; 03:40f2 ld a, JUMP_LEFT ret -CheckMovementSkateboard:: ; 03:4131 +CheckMovementSkateboard:: call _CheckMovementSkateboard jp SetPlayerMovement -_CheckMovementSkateboard: ; 03:4137 +_CheckMovementSkateboard: ld a, [wSkatingDirection] cp STANDING jp z, .not_moving @@ -211,13 +211,13 @@ _CheckMovementSkateboard: ; 03:4137 pop de jp hl -.SkateMovementTable ; 03:414d +.SkateMovementTable dw CheckSkateDown dw CheckSkateUp dw CheckSkateLeft dw CheckSkateRight -.not_moving ; 03:4155 +.not_moving ld a, d and D_PAD jp z, .idle @@ -236,7 +236,7 @@ _CheckMovementSkateboard: ; 03:4137 ld a, NO_MOVEMENT ret -CheckSkateDown: ; 03:4177 +CheckSkateDown: ld a, [wPlayerLastMapY] inc a ld [wPlayerNextMapY], a @@ -271,7 +271,7 @@ CheckSkateDown: ; 03:4177 ld a, FACE_DOWN ret -CheckSkateUp: ; 03:41ab +CheckSkateUp: ld a, [wPlayerLastMapY] dec a ld [wPlayerNextMapY], a @@ -302,7 +302,7 @@ CheckSkateUp: ; 03:41ab ld a, FACE_UP ret -CheckSkateLeft: ; 03:41db +CheckSkateLeft: ld a, [wPlayerLastMapX] dec a ld [wPlayerNextMapX], a @@ -333,7 +333,7 @@ CheckSkateLeft: ; 03:41db ld a, FACE_LEFT ret -CheckSkateRight: ; 03:420b +CheckSkateRight: ld a, [wPlayerLastMapX] inc a ld [wPlayerNextMapX], a @@ -364,7 +364,7 @@ CheckSkateRight: ; 03:420b ld a, FACE_RIGHT ret -OldIsTileCollisionGrass:: ; 03:423b +OldIsTileCollisionGrass:: ; Check whether collision ID in a is ; grass ; Result: @@ -379,11 +379,11 @@ OldIsTileCollisionGrass:: ; 03:423b cp $8b ret -OldCheckMovementSurf:: ; 03:4247 +OldCheckMovementSurf:: call _OldCheckMovementSurf jp SetPlayerMovement -_OldCheckMovementSurf: ; 03:424d +_OldCheckMovementSurf: ld a, d and D_PAD bit D_DOWN_F, a @@ -481,7 +481,7 @@ _OldCheckMovementSurf: ; 03:424d ld a, SLOW_STEP_RIGHT ret -OldIsTileCollisionWater:: ; 03:42ee +OldIsTileCollisionWater:: ; Check if collision ID in a is water ; Input: ; a - collision ID @@ -496,7 +496,7 @@ OldIsTileCollisionWater:: ; 03:42ee scf ret -SetPlayerStateWalk:: ; 03:42f8 +SetPlayerStateWalk:: push bc ld a, PLAYER_NORMAL ld [wPlayerState], a @@ -504,7 +504,7 @@ SetPlayerStateWalk:: ; 03:42f8 pop bc ret -IsPlayerCollisionTileSolid:: ; 03:4303 +IsPlayerCollisionTileSolid:: ; Return whether the collision under player's feet ; is solid/sometimes solid or non-solid. ; Clobbers: a @@ -519,7 +519,7 @@ IsPlayerCollisionTileSolid:: ; 03:4303 pop de ret -CheckPlayerObjectCollision:: ; 03:4312 +CheckPlayerObjectCollision:: ; Check whether player object currentl ; collides with any other object. ; Result: @@ -531,7 +531,7 @@ CheckPlayerObjectCollision:: ; 03:4312 ret nc jp CheckCompanionObjectCollision -CheckCompanionObjectCollision:: ; 03:4320 +CheckCompanionObjectCollision:: ; Marks the object struct pointed to by hl ; as having collided with player object. ; If object struct (as identified by hObjectStructIndexBuffer) @@ -562,7 +562,7 @@ CheckCompanionObjectCollision:: ; 03:4320 ld [wCompanionCollisionFrameCounter], a ret -_OverworldMovementCheck:: ; 03:4344 +_OverworldMovementCheck:: ld a, PLAYER_OBJECT_INDEX ldh [hEventCollisionException], a ld a, [wPlayerDirection] @@ -580,7 +580,7 @@ _OverworldMovementCheck:: ; 03:4344 call GetPlayerMovementByState jp SetPlayerMovement -GetPlayerMovementByState: ; 03:4364 +GetPlayerMovementByState: ld a, [wPlayerState] cp PLAYER_SKATE jp z, CheckMovementSkateboard ; FIXME: CheckMovementSkateboard already calls SetPlayerMovement @@ -590,14 +590,14 @@ GetPlayerMovementByState: ; 03:4364 jp z, CheckMovementSurf jp CheckMovementWalk -CheckMovementWalk:: ; 03:4374 +CheckMovementWalk:: ld a, [wPlayerStandingTile] swap a and LOW((COLLISION_TYPE_MASK >> 4) | (COLLISION_TYPE_MASK << 4)) ld hl, .WalkingCollisionTable jp CallJumptable -.WalkingCollisionTable ; 03:4381 +.WalkingCollisionTable dw CheckMovementWalkRegular ; regular dw CheckMovementWalkSolid ; trees, grass, etc. dw CheckMovementWalkSolid ; water @@ -615,14 +615,14 @@ CheckMovementWalk:: ; 03:4374 dw CheckMovementWalkRegular ; unused dw CheckMovementWalkRegular ; unused -NoWalkMovement: ; 03:43a1 +NoWalkMovement: ld a, NO_MOVEMENT ret -CheckMovementWalkSolid:: ; 03:43a4 +CheckMovementWalkSolid:: jp CheckMovementWalkRegular -CheckMovementWalkLand:: ; 03:43a7 +CheckMovementWalkLand:: ld a, [wPlayerStandingTile] and COLLISION_SUBTYPE_MASK jr nz, .force_movement @@ -648,7 +648,7 @@ CheckMovementWalkLand:: ; 03:43a7 ld a, b ret -SlowDownMovementWalk: ; 03:43cf +SlowDownMovementWalk: ld b, SLOW_STEP_DOWN cp STEP_DOWN jr z, .finish @@ -666,7 +666,7 @@ SlowDownMovementWalk: ; 03:43cf ld a, b ret -CheckMovementWalkLand2:: ; 03:43ea +CheckMovementWalkLand2:: ld a, [wPlayerStandingTile] and COLLISION_SUBTYPE_MASK ld b, STEP_DOWN @@ -686,10 +686,10 @@ CheckMovementWalkLand2:: ; 03:43ea ld a, b ret -UnusedCheckMovementWalk60:: ; 03:4409 +UnusedCheckMovementWalk60:: jp CheckMovementWalkRegular -CheckMovementWalkWarp:: ; 03:440c +CheckMovementWalkWarp:: ld a, [wPlayerStandingTile] and COLLISION_SUBTYPE_MASK jr z, .check_dpad @@ -747,13 +747,13 @@ CheckMovementWalkWarp:: ; 03:440c .moved_out_of_bounds ret -CheckMovementWalkMisc:: ; 03:4472 +CheckMovementWalkMisc:: jp CheckMovementWalkRegular -CheckMovementWalkSpecial:: ; 03:4475 +CheckMovementWalkSpecial:: jp CheckMovementWalkRegular -CheckMovementWalkRegular:: ; 03:4478 +CheckMovementWalkRegular:: ldh a, [hJoyState] bit D_DOWN_F, a jp nz, CheckWalkDown @@ -765,7 +765,7 @@ CheckMovementWalkRegular:: ; 03:4478 jp nz, CheckWalkRight jp NoWalkMovement -CheckMovementWalkJump: ; 03:4491 +CheckMovementWalkJump: ldh a, [hJoyState] bit D_DOWN_F, a jr nz, .down @@ -833,7 +833,7 @@ CheckMovementWalkJump: ; 03:4491 ld a, JUMP_RIGHT ret -CheckWalkDown:: ; 03:4502 +CheckWalkDown:: ld d, 0 ld e, 1 call CheckObjectCollision @@ -847,7 +847,7 @@ CheckWalkDown:: ; 03:4502 ld a, FACE_DOWN ret -CheckWalkUp:: ; 03:4519 +CheckWalkUp:: ld d, 0 ld e, -1 call CheckObjectCollision @@ -861,7 +861,7 @@ CheckWalkUp:: ; 03:4519 ld a, FACE_UP ret -CheckWalkLeft:: ; 03:4530 +CheckWalkLeft:: ld d, -1 ld e, 0 call CheckObjectCollision @@ -875,7 +875,7 @@ CheckWalkLeft:: ; 03:4530 ld a, FACE_LEFT ret -CheckWalkRight:: ; 03:4547 +CheckWalkRight:: ld d, 1 ld e, 0 call CheckObjectCollision @@ -889,14 +889,14 @@ CheckWalkRight:: ; 03:4547 ld a, FACE_RIGHT ret -CheckMovementSurf:: ; 03:455e +CheckMovementSurf:: ld a, [wPlayerStandingTile] swap a and LOW((COLLISION_TYPE_MASK >> 4) | (COLLISION_TYPE_MASK << 4)) ld hl, .SurfCollisionTable jp CallJumptable -.SurfCollisionTable ; 03:456b +.SurfCollisionTable dw CheckMovementSurfRegular dw CheckMovementSurfRegular dw CheckMovementSurfWater @@ -914,7 +914,7 @@ CheckMovementSurf:: ; 03:455e dw CheckMovementSurfRegular dw CheckMovementSurfRegular -CheckMovementSurfRegular:: ; 03:458b +CheckMovementSurfRegular:: ldh a, [hJoyState] bit D_DOWN_F, a jp nz, CheckSurfDown @@ -926,7 +926,7 @@ CheckMovementSurfRegular:: ; 03:458b jp nz, CheckSurfRight jp NoWalkMovement -CheckMovementSurfWater:: ; 03:45a4 +CheckMovementSurfWater:: ld a, [wPlayerStandingTile] and COLLISION_SUBTYPE_MASK cp (COLLISION_WATERFALL & COLLISION_SUBTYPE_MASK) @@ -935,7 +935,7 @@ CheckMovementSurfWater:: ; 03:45a4 ld a, FAST_STEP_DOWN ret -CheckMovementSurfWater2:: ; 03:45b0 +CheckMovementSurfWater2:: ld a, [wPlayerStandingTile] and COLLISION_WATER_SUBTYPE_MASK ld d, STEP_RIGHT @@ -954,7 +954,7 @@ CheckMovementSurfWater2:: ; 03:45b0 ld a, d ret -CheckSurfDown: ; 03:45cd +CheckSurfDown: ld d, 0 ld e, 1 call CheckObjectCollision @@ -970,7 +970,7 @@ CheckSurfDown: ; 03:45cd ld a, FACE_DOWN ret -CheckSurfUp: ; 03:45e7 +CheckSurfUp: ld d, 0 ld e, -1 call CheckObjectCollision @@ -986,7 +986,7 @@ CheckSurfUp: ; 03:45e7 ld a, FACE_UP ret -CheckSurfLeft: ; 03:4601 +CheckSurfLeft: ld d, -1 ld e, 0 call CheckObjectCollision @@ -1002,7 +1002,7 @@ CheckSurfLeft: ; 03:4601 ld a, FACE_LEFT ret -CheckSurfRight: ; 03:461b +CheckSurfRight: ld d, 1 ld e, 0 call CheckObjectCollision @@ -1018,10 +1018,10 @@ CheckSurfRight: ; 03:461b ld a, FACE_RIGHT ret -SurfDismount: ; 03:4635 +SurfDismount: jp SetPlayerStateWalk -CheckObjectCollision:: ; 03:4638 +CheckObjectCollision:: ; Check if coordinates relative ; to player collide with another object ; Clobbers: @@ -1082,16 +1082,16 @@ GetCollisionType:: SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX -_UnusedReturnFalse:: ; 03:4764 +_UnusedReturnFalse:: xor a ret -_UnusedReturnTrue:: ; 03:4766 +_UnusedReturnTrue:: xor a scf ret -CheckCollisionSometimesSolid:: ; 03:4769 +CheckCollisionSometimesSolid:: ; Checks whether collision ID in a ; is sometimes, always or never solid. ; Clobbers: @@ -1124,13 +1124,13 @@ CheckCollisionSometimesSolid:: ; 03:4769 SECTION "engine/overworld/player_movement.asm@_RedrawPlayerSprite", ROMX -_RedrawPlayerSprite: ; 05:4000 +_RedrawPlayerSprite: call GetPlayerSprite ld hl, vChars0 call LoadOverworldSprite ret -GetPlayerSprite: ; 05:400a +GetPlayerSprite: ld a, [wPlayerState] ld hl, PlayerSpriteTable ld c, a @@ -1153,7 +1153,7 @@ GetPlayerSprite: ; 05:400a ld [wPlayerObjectSprite], a ret -PlayerSpriteTable: ; 03:402d +PlayerSpriteTable: ; state, sprite db PLAYER_NORMAL, SPRITE_GOLD db PLAYER_BIKE, SPRITE_GOLD_BIKE diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 77da684..e19eb54 100755 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/overworld/spawn_points.asm", ROMX -LoadSpawnPoint: ; 03:4791 +LoadSpawnPoint: ; loads the spawn point in wDefaultSpawnPoint push hl push de @@ -29,7 +29,7 @@ LoadSpawnPoint: ; 03:4791 pop hl ret -IsSpawnPoint: ; 03:47b6 +IsSpawnPoint: ; Checks if the map loaded in de is a spawn point. ; Returns carry if it's a spawn point. ld hl, SpawnPoints diff --git a/engine/palettes.asm b/engine/palettes.asm index 1f8f4df..39c38d6 100644 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -2,14 +2,14 @@ INCLUDE "constants.asm" SECTION "engine/palettes.asm@Overworld fade", ROMX -OverworldFadeIn:: ; 23:433e +OverworldFadeIn:: ld c, 0 call GetFadeStep ld b, 4 call FadeTowardsWhite ret -OverworldFadeOut:: ; 23:4349 +OverworldFadeOut:: ld c, 9 call GetFadeStep ld b, 4 @@ -20,7 +20,7 @@ OverworldFadeOut:: ; 23:4349 ; TODO: merge this SECTION "engine/palettes.asm@Palette fading, part 2?", ROMX -ApplyPalettesAtHL:: ; 23:43d1 +ApplyPalettesAtHL:: push hl ld a, [hli] ld [rBGP], a @@ -31,7 +31,7 @@ ApplyPalettesAtHL:: ; 23:43d1 pop hl ret -FadeTowardsWhite:: ; 23:43dd +FadeTowardsWhite:: call ApplyPalettesAtHL inc hl inc hl @@ -42,7 +42,7 @@ FadeTowardsWhite:: ; 23:43dd jr nz, FadeTowardsWhite ret -FadeTowardsBlack:: ; 23:43ec +FadeTowardsBlack:: call ApplyPalettesAtHL dec hl dec hl @@ -53,7 +53,7 @@ FadeTowardsBlack:: ; 23:43ec jr nz, FadeTowardsBlack ret -GetFadeStep:: ; 23:43fb +GetFadeStep:: ld a, [wTimeOfDayPal] and 3 push bc diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index 929af05..0bb3536 100755 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/pokemon/health.asm@HealParty", ROMX -HealParty: ; 03:4d6f +HealParty: ld hl, wPartySpecies ld de, wPartyMons @@ -97,7 +97,7 @@ HealParty: ; 03:4d6f SECTION "engine/pokemon/health.asm@HP Bar", ROMX -ComputeHPBarPixels: ; 03:4e3c +ComputeHPBarPixels: push hl xor a ldh [hMultiplicand], a @@ -140,7 +140,7 @@ ComputeHPBarPixels: ; 03:4e3c ld e, 1 ret -UpdateHPBar: ; 03:4e7c +UpdateHPBar: ld a, [wHPBarOldHP] ld c, a ld a, [wHPBarOldHP + 1] @@ -229,7 +229,7 @@ UpdateHPBar: ; 03:4e7c ; animates the HP bar going up or down for (a) ticks (two waiting frames each) ; stops prematurely if bar is filled up ; e: current health (in pixels) to start with -UpdateHPBar_AnimateHPBar: ; 03:4F11 +UpdateHPBar_AnimateHPBar: push hl .bar_animation_loop @@ -259,7 +259,7 @@ UpdateHPBar_AnimateHPBar: ; 03:4F11 ret ; compares old HP and new HP and sets c and z flags accordingly -UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37 +UpdateHPBar_CompareNewHPToOldHP: ld a, d sub b ret nz @@ -268,7 +268,7 @@ UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37 ret ; calcs HP difference between bc and de (into de) -UpdateHPBar_CalcHPDifference: ; 03:4F3D +UpdateHPBar_CalcHPDifference: ld a, d sub b jr c, .old_hp_greater @@ -297,7 +297,7 @@ UpdateHPBar_CalcHPDifference: ; 03:4F3D ld de, 0 ret -UpdateHPBar_PrintHPNumber: ; 03:4F5B +UpdateHPBar_PrintHPNumber: push af push de ld a, [wHPBarType] @@ -329,7 +329,7 @@ UpdateHPBar_PrintHPNumber: ; 03:4F5B ; calcs number of HP bar pixels for old and new HP value ; d: new pixels ; e: old pixels -UpdateHPBar_CalcOldNewHPBarPixels: ; 03:4F8B +UpdateHPBar_CalcOldNewHPBarPixels: push hl ld hl, wHPBarMaxHP ld a, [hli] diff --git a/engine/predef.asm b/engine/predef.asm index a47d25c..cf2ec8c 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/predef.asm", ROMX -GetPredefPointer:: ; 1:62b0 +GetPredefPointer:: ld a, h ld [wPredefHL], a ld a, l diff --git a/engine/smallflag.asm b/engine/smallflag.asm index c170851..5b5153e 100755 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -1,6 +1,6 @@ SECTION "engine/smallflag.asm", ROMX -SmallFarFlagAction: ; 03:4d33 +SmallFarFlagAction: ; Perform action b on bit c in flag array hl. ; If checking a flag, check flag array d:hl unless d is 0. diff --git a/engine/sprites/sprites.asm b/engine/sprites/sprites.asm index 6d96690..9f9e4e5 100644 --- a/engine/sprites/sprites.asm +++ b/engine/sprites/sprites.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/sprites/sprites.asm@LoadOverworldSprite", ROMX -LoadOverworldSprite: ; 05:4150 +LoadOverworldSprite: push af call GetOverworldSpriteData push bc @@ -33,7 +33,7 @@ LoadOverworldSprite: ; 05:4150 ; get the data for overworld sprite in a ; returns: gfx ptr in hl, length in c, bank in b -GetOverworldSpriteData: ; 05:417d +GetOverworldSpriteData: push hl dec a ld l, a diff --git a/engine/unknown11d32.asm b/engine/unknown11d32.asm index a4bb40b..0a806e4 100644 --- a/engine/unknown11d32.asm +++ b/engine/unknown11d32.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/unknown11d32.asm", ROMX -Unknown11d32: ; 04:5D32 +Unknown11d32: ld hl, hJoySum ld a, [hl] and D_UP @@ -85,8 +85,8 @@ Unknown11d32: ; 04:5D32 ld [hl], a ret -.Offsets1: ; 04:5DAB +.Offsets1: db $00, $08, $10, $18, $20, $28, $30, $48, $50, $58, $60, $68, $70, $78 -.Offsets2: ; 04:5DB9 +.Offsets2: db $00, $08, $18, $20, $30 diff --git a/engine/unknown_boxes.asm b/engine/unknown_boxes.asm index 378cfdf..d2a6ede 100644 --- a/engine/unknown_boxes.asm +++ b/engine/unknown_boxes.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "engine/unknown_boxes.asm", ROMX -Function1130a: ; 04:530A +Function1130a: ret -Function1130b: ; 04:530B +Function1130b: ld a, [wPartyCount] cp PARTY_LENGTH jr c, .bigjump @@ -39,7 +39,7 @@ Function1130b: ; 04:530B scf ret -RecievePokemon: ; 04:5357 +RecievePokemon: ld a, [wMonDexIndex] push af ld [wNamedObjectIndexBuffer], a @@ -54,7 +54,7 @@ RecievePokemon: ; 04:5357 ld hl, RecievePokemonText jp PrintText -RecievePokemonText: ; 04:5377 +RecievePokemonText: text "<PLAYER>は" line "@" @@ -64,7 +64,7 @@ RecievePokemonText: ; 04:5377 db $0B, "@" -BoxCantHoldText: ; 04:538B +BoxCantHoldText: text "#を もちきれないので" line "<PC>の ボックス@" db $01, $31, $CD @@ -74,7 +74,7 @@ BoxCantHoldText: ; 04:538B text "を てんそうした！" done -BoxFullText: ; 04:53B6 +BoxFullText: text "#を もちきれません！" para "ボックスも いっぱいで" line "てんそうできません！" |